Merged danburket/agnoster into upstream

Conflicts:
	themes/agnoster.zsh-theme
Default to old powerline and make configurable