Merge pull request #4 from kaedroho/master

Change wagtailsearch settings to use new settings format
Merge pull request #5 from kaedroho/master

Updated readme to use new wagtailsearch settings format
tweaks required to compile sass
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
Merge pull request #6 from kaedroho/master

Removed unneeded line in settings
Merge branch 'master' into sass
use django-pyscss, now we've figured out the magic incantation
Typo?

It doesn't look like you intended to return a tuple from this function.
Merge pull request #9 from donspaulding/patch-1

Typo?
fix non-vagrant setup docs so that they don't refer to a non-existent manage.py createdb command - fixes #8
Added missing bxslider images