vim
Merge branch 'master' of https://github.com/saikobee/dotfiles

Conflicts:
	vimrc