Several small changes

* Cleaned up namespaces
* Fixed aggregation sort
* Allow for new-style config file
* Remove CFPB branding