Adding Java 7 support
Ready for initial deploy to Heroku