improved setup docs, tweaked pysetup prompt
Merge branch 'master' into develop