Merge master (rebase being super annoying). Fix conflicts

e6ccd37b · Chris McCuller · 30ef8566 · 76a26a2a · e6ccd37b · e6ccd37b
Commit e6ccd37b authored Sep 21, 2015 by Chris McCuller
--- a/themes/amuse.zsh-theme
+++ b/themes/amuse.zsh-theme
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
--- a/themes/cypher.zsh-theme
+++ b/themes/cypher.zsh-theme
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
--- a/themes/emotty.zsh-theme
+++ b/themes/emotty.zsh-theme
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
--- a/tools/install.sh
+++ b/tools/install.sh
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh