Custom mods
Merge branch 'master' into custom

Conflicts:
	themes/agnoster.zsh-theme
Minor change