Merge cpad:~/.vim

Conflicts:
	plugins/unite
Merge branch 'master' of simon.psaux.de:dot.vim