modified
Merge branch 'master' of github.com:seventhsense/dot-vim-files

Conflicts:
	.vimrc