updated upgrading guide
merged changes
Updated automatic setup options
Merge pull request #30 from nivin/master

Updates to upgrade guide and startup options.