Fix puppet dependencies so machine comes up correctly

Also adjust migration test script.

Author: codeinthehole

sites/puppet/manifests/site.pp

@@ -14,6 +14,7 @@
 		"python-memcache",
 		"postgresql-server-dev-9.1",
 		"libmysqlclient-dev",
+		"git-core",
     ]
     package {
         $packages: ensure => installed,
@@ -78,6 +79,7 @@
 	}
 	python::pip::requirements {"/vagrant/requirements_vagrant.txt":
 	    venv => $virtualenv,
+		require => Python::Venv::Isolate[$virtualenv]
 	}
     exec {"install-oscar":
 	    command => "$virtualenv/bin/python /vagrant/setup.py develop",

sites/sandbox/test_migrations.sh

@@ -7,6 +7,6 @@ mysql -u root --password=root_password -e "DROP DATABASE IF EXISTS oscar_vagrant
 
 # Postgres
 sudo -u postgres psql -c "DROP DATABASE IF EXISTS oscar_vagrant"
-sudo -u postgres psql -c "CREATE DATABASE oscar_vagrant ENCODING UTF8"
+sudo -u postgres psql -c "CREATE DATABASE oscar_vagrant"
 ./manage.py syncdb --noinput --settings=settings_postgres > /dev/null
 ./manage.py migrate --noinput --settings=settings_postgres