Merge branch 'master' into parent-master, closes #3
Testing out zsh themes, because awesome.
Merge branch 'parent-master'