Typo
D’oh! Same typo in the tests!
Merge branch 'develop' of github.com:OAButton/server into develop
Add gunicorn to the requirements
add gunicorn 18 to requirements.txt
undid gunicorn in requirements.txt
reordered wsgi.py lines
just clobber local dev setup for now - we're going to drop sql anyway
Merge branch 'develop' of github.com:OAButton/server into develop
try to bring by local settings.py
Add instructions for how to use vagrant in INSTRUCTIONS.md.
Update the README - we’re on django now!
Merge pull request #96 from jezcope/feature/95-vagrant-instructions

Add instructions for how to use vagrant in INSTRUCTIONS.md.
Convert to using django-mongonaut and mongoengine and drop SQL
entirely
* added mongodb service to travis
* converted show_map to use mongoengine
* added a mock to web/tests when testing database counts from mongodb
* lazy import the Event model in homepage so that we can mock it out
* added nose dependency for testcases
* fixed the hostname when testing locally
Merge branch 'features/mongoengine2' into features/mongoengine

Conflicts:
	oabutton/apps/bookmarklet/models.py
	oabutton/apps/bookmarklet/views.py
	oabutton/apps/web/views.py
	oabutton/settings.py