vim: reorganize and tidy; add some settings
Merge branch 'master' of https://github.com/ict/dotfiles

Conflicts:
	home/.vimrc