Install Wildfire.vim bundle as a submodule.
Merge branch 'master' of https://github.com/bvt/dotvim

Conflicts:
	.gitmodules