Added folksonomy to the dictionary.
Merge branch 'master' of github.com:daviesjamie/dotfiles

Conflicts:
	.vim/custom-dictionary.utf-8.add