Modeline power,
Merge branch 'master' of https://github.com/nfriedli/vim

Conflicts:
	.vimrc