change desertEx to desert
Merge branch 'master' into ycm

Conflicts:
	.vimrc