Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' of https://github.com/stucco/dev-setup
Merge branch 'master' of https://github.com/stucco/dev-setup
Merge branch 'master' of https://github.com/stucco/dev-setup
Merge branch 'master' of https://github.com/stucco/dev-setup
updated java cookbook, now uses git repo master branch directly