Forgot to reply, apparently.
I'd prefer the pull request to go into master. I'm trying to keep 3.1.x to primarily bug fixes and this seems larger than that. I've also not seen many major 3.1.x bugs and so the next release will probably be 3.2.0.
Good points on the main method usage. I am starting to shift to more of a command pattern that will be called by Main, ant tasks, etc. but the Main method will always be there as an easier integration point.
Nathan