Tidied up .vimrc
Enabled TODO-style highlighting of '@todo'
Deactivated formatlistpat option in text.vim
Merge branch 'master' of https://github.com/12qu/dotvim

Conflicts:
	.vimrc