Test commit
Merge branch 'test' of /home/git/repositories/firemage/vimrc
Added nerd commenter.
Converted project to use submodules.
Merge branch 'master' of github.com:katyukha/.vim

Conflicts:
	bundle/vim-fugitive