do
do
Merge branch 'master' of github.com:bogdan/dotvim

Conflicts:
	.gitmodules