new vim config
Merge branch 'master' of github.com:gnarlie/home

Conflicts:
	Makefile