Added commentary
Merge branch 'master' of github.com:trq/dotfiles

Conflicts:
	.gitmodules
	mygitconfig
Updating vim plugins
Again, updating vim plugins
Add conflicts git alias