Fixing the order of some things
Merge branch 'master' of github.com:yefb/dotfiles

Conflicts:
	.vimrc