changed the settings variables to have the *DB designator
if we don't have the time, don't show it
whitespace
access environment variables via the Config class and fallback to the default settings file

- we can now access heroku env vars via the config dict
whitespace
remove print statement
use google anaytics if it is configured
redirect to the correct flight url after form completion
whitespace
remove merge and push script, no longer necessary