Fixes
Merge branch 'master' of https://github.com/donaldpiret/dotfiles

Conflicts:
	home/.zshrc