cleanup the remaining references to the 2scoops app settings weirdness
Merge branch 'master' of https://github.com/expa/expa-deploy