Merge branch 'master' of github.com:rosshadden/dotfiles

Conflicts:
	rc/.vim/vimrc