Merged danburket/agnoster into upstream

Conflicts:
	themes/agnoster.zsh-theme
Merge branch 'agnoster'