Remove java override for phpstorm
git config --global push.default=simple
Merge branch 'master' of github.com:Sannis/dotfiles