Map :q1 to :q! for convenience
Merge branch 'master' of github.com:daGrevis/Dotfiles

Conflicts:
	.vimrc
Wut, Vundle.vim?