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

Conflicts:
	dotvimrc
Merge branch 'master' of http://github.com/nicr9/dotfiles

Conflicts:
	dotvimrc