Added M2_REPO location and added default simple git
Merge branch 'master' of https://github.com/NickCody/dotfiles

Conflicts:
	dotbashrc