Merge branch 'master' into installer-cygwin-support-3

Conflicts: tools/install.sh

Merge branch 'master' into installer-cygwin-support-3
Conflicts: tools/install.sh
96ff8614 · Andrew Janke · 502f08b5 · 76a26a2a · 96ff8614 · 96ff8614
Commit 96ff8614 authored Sep 23, 2015 by Andrew Janke
--- 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