the flask script import has changed or something
Add psycopg2 to requirements
someone forgot to add this
more uncommited changes
merge some little bits
Merge branch 'remove-google-checkout'
Splash page flag
Upgrade to Bootstrap 3
Upgrade and freeze requirements
Fix CSRF protection
Slightly ugly update to add the date and location.
Redirect wave pages to the Internet Archive
Add CSRF token to list sign-up
Merge branch 'master' into emf-2014

Conflicts:
	requirements.txt
	templates/main.html
	templates/tickets.html
	views/__init__.py

N.B. templates/tickets.html came back again, but afaict we don't actually need it.