Specified python3 in zshrc
Reverted prompt to earlier version, hopefully fixed spacing
Merge branch 'master' into minimal

Merged master changes