Various changes.
Merge branch 'master' of https://github.com/henry4k/dotfiles

Conflicts:
	vim/main.vim