dict update
Merge branch 'master' of https://github.com/Valloric/dotfiles

Conflicts:
	vim/spell/en.latin1.add
Switching to upstream syntastic
More ycm conf tweaks