Simplify first time setup procedure
Merge pull request #31 from alancutter/simplerSetup

Simplify first time setup procedure