Adding nginx config to fix bad gateway problem
Merge branch 'master' of github.com:scipy-conference/SciPy-2014
Merge pull request #124 from polarbeardesign/master

changing local db setting back to default
Extending Early Bird Registration
Extending Early Bird Registration
updated homepage to remove expired earlybird pricing