update readme to eliminate things that are no longer dependencies
Add Vagrantfile.local mechanism, and indicate how to use it to set up a Wagtail developer instance
Comment out optional dependencies in Vagrant install script
update readme with details of setting up vagrant for Wagtail development
upgrade django-taggit to 0.11.2 to fix manage.py dumpdata (https://github.com/alex/django-taggit/issues/155)
Add demo content fixtures
Add script to import demo site data after migration has completed
oops, missed out StandardPage records from demo fixtures
not using YAML fixtures, so take that out of the install script
Merge branch 'master' into sass

Conflicts:
	requirements.txt