cool vimrc
Merge branch 'master' of https://github.com/lambdan/config

Conflicts:
	.vimrc