Re-ordered the setup sequence, added extra fields to vagrant setup.
Merge pull request #180 from JonTheNiceGuy/FixSetupIssues

Re-ordered the setup sequence, added extra fields to vagrant setup.