Paths were broken in puppet because api is now a sub-module; turned off tests to improve loading time for vagrant users; fixed database syntax error for patching the database.
Merge remote-tracking branch 'upstream/master' into puppet_db_setup
Updating the documentation to reflect changes made to the build scripts. In particular, have notified users that test suite is disabled by default.
Adding OSX-friendly copy-paste command for updating the /etc/hosts file
Fixing white space issues so that code is indented.
Formatting fix and language clarification for vagrant commands to improve readability
Whitespace fixes for the vagrant commands
Merge pull request #741 from emmajane/puppet_db_setup

Puppet db setup