Updated vimrc
Merge branch 'master' of github.com:baekdahl/vimrc

Conflicts:
	.vimrc