Ignore the secrets bag, only for backup.
Merge branch 'master' into pycon2014
refactor out local_settings