Fixing db config
Turning debugging on for stage
Merge branch 'master' of git.pagodabox.com:csws-stg
Merge branch 'master' of git.pagodabox.com:csws-stg