Merge pull request #351 from brethauer/master

fixes issues 346, 334, 333, 320, 322, 323
added DAP snippet
Merge branch 'master' of https://github.com/18F/mirage
Merge pull request #352 from kaitlin/master

Added DAP snippet
Merge pull request #353 from 18F/master

Deploying CSS fixes and DAP snippet to production
added explicit sort to naics endpoint
chained the queries in naics endpoint
Merge pull request #354 from kaitlin/master

added explicit sort to naics endpoint
Merge pull request #355 from 18F/production

Merge pull request #353 from 18F/master
Add test comment for deployment
Merge pull request #358 from dlapiduz/master

Add test comment for deployment test
Revert "Add test comment for deployment"

This reverts commit 6494c5a5c557f492c95a701aa7eb212c484bf518.
Merge pull request #360 from dlapiduz/master

Revert "Add test comment for deployment"
changed django-rest-swagger version in requirements, added doc settings and template
Merge pull request #362 from kaitlin/docs

changed django-rest-swagger version in requirements, added doc settings ...
fixes to docs
Merge pull request #363 from kaitlin/docs

fixes to docs
Merge pull request #364 from 18F/docs

Pulling doc/swagger changes into master
fixed api docs typo in settings, updating check_sam to raise exception if wrong api key
Merge branch 'master' of https://github.com/18F/mirage into docs