A lot of refactoring
Merge branch 'master' of https://github.com/klaustopher/dotfiles

Conflicts:
	zsh/prompt.zsh