Encoding specific database instructions
Get a list of all the offices of an agency, include sub-agencies
Rename method name to be more indicative of what it is doing
Fixed merge conflicts
Add test to check all components listed
PEP8
PEP8
Merge pull request #240 from 18F/expandoffices

On a contact page, show sub-agencies in the list of offices.
Fixed merge conflict