Use Java7 on the Mac
Merge branch 'master' of https://github.com/eddarmitage/dotfiles