vimrc tweaks
Merge branch 'master' of github.com:irskep/irskep_dotfiles

Conflicts:
	vimrc