tweeks
Merge branch 'master' of https://github.com/mgarcia/myvim

Conflicts:
	.vimrc