JDK 7
-- adding more config to try and get heroku working