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