Misc fixes
Merge branch 'master' of https://github.com/n1ck3/conf-local

Conflicts:
	zsh/local.zsh