Initial commit
Merge branch 'master' of github.com:jwalgran/dotvim

Conflicts:
	.gitmodules
	bundle/emmet
	vimrc