More changes!
Merge branch 'master' of http://github.com/mcreenan/dotfiles

Conflicts:
	.gitmodules
	bashrc
	vimrc