Merge app config changes from YAVA.
Merge pull request #1 from openplans/app-config

Merge app config changes from YAVA.