merge
more maven setup

even more maven
Merge branch 'master' of https://github.com/emmett9001/dotfiles