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

Conflicts:
	.gitmodules