* Fix settings override.
* Accommodate JSON() which actually returns a dict instead of a JSON
string.
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere