Fix amer theme gitprompt
Merge branch 'amer-theme'

Conflicts:
	themes/amer.zsh-theme