Latest changes on netbook
Merge branch 'master' of https://github.com/j127/vimrc

Conflicts:
	.vimrc