bump upload limit to 10M #11
add cancelled to admin interface
Merge pull request #116 from scipy-conference/admin_cancel_view

add cancelled to admin interface
Changes to homepage for end of early bird pricing. Consolidated homepage info tiles, removed early bird pricing reminder from page headers
Merge pull request #117 from polarbeardesign/pricing_update

Changes to homepage for end of early bird pricing. Consolidated homepage...
update to pricing table
Merge pull request #118 from polarbeardesign/master

update to pricing table
extending early bird pricing to May 22nd
Merge pull request #119 from polarbeardesign/master

extending early bird pricing to May 22nd
add box tags to pages so that admins can edit content
Merge pull request #120 from scipy-conference/presenter_info

add box tags to pages so that admins can edit content
having rewrite rule in nginx go to configurable place
make rewrite rule a template
Merge pull request #77 from scipy-conference/fabstaging

having rewrite rule in nginx go to configurable place
bump versions of django and symposion fork, add useful django-extensions
Merge pull request #121 from scipy-conference/useful

bump versions of django and symposion fork, add useful django-extensions
Adding content to homepage
Adding details to wssspe page