Git-meld update
Vimrc tweaks + new entries for spell dict
Merge branch 'master' of https://github.com/Valloric/dotfiles

Conflicts:
	vim/spell/en.latin1.add