Use setup's upgrade option when appropriate; reorder prompts
Merge pull request #10 from bcipolli/release-0.10.3

Use setup's upgrade option when appropriate; reorder prompts