lantern's vimrc backup
Merge branch 'master' of https://github.com/lantern/vimrc

Conflicts:
	README.md
	vimrc