updates
Merge branch 'master' of git://github.com/khale/dotvim

Conflicts:
	vimrc