various updates
Merge branch 'master' of github.com:arachnegl/dot-files

Conflicts:
	vimrc