Updated a few things
Merge github.com:mcasper/dotfiles

Conflicts:
	vimrc
	vimrc.bundles