showing line numbers
Merge branch 'master' of https://github.com/ntinkler/vim

Conflicts:
	.vimrc