Make vimrc better
Merge branch 'master' of github.com:mikeastock/dotfiles

Conflicts:
	vimrc