Merge branch 'master' of https://github.com/nicr9/dotfiles

Conflicts:
	.gitmodules
Merge branch 'master' of https://github.com/nicr9/dotfiles