Keep more settings in Pycon source control.

Just override in chef the things that we really only
know at deploy time.
Don't need the ?1:0 part
Merge branch 'master' into pycon-settings-changes
Add deploy-specific config to gunicorn environment
Back out local_settings changes for now

Make it safe to merge this without requiring changes in the
server code yet.
Add more useful values to the environment
Merge pull request #34 from python/pycon-settings-changes

Keep more settings in Pycon source control.