Edits as of 7/9
Merge branch 'master' of https://github.com/GLoganDR/prompt