added JAVA_HOME for dev server
Merge branch 'master' of github.com:DavidWinterbottom/dotfiles