..
Merge branch 'master' of git@github.com:green0eggs/ConfigFiles

Conflicts:

	.vim/cmaps.vim
	.vimrc