Modified a line.
Change to vimrc.
Merge branch 'ubuntu'

Conflicts:
	.vimrc