Adding Java 7 support
Adding Heroku support
minor cleanup