Merge pull request #340 from kaitlin/master

removed debug from settings file, added allowed hosts
Merge pull request #342 from kaitlin/master

updated static assets to work with S3
possible fix for #324

Avoid the race condition by creating an asynchronous function for
getting the selected NAICS text in InputHandler.
Merge pull request #344 from kaitlin/master

updated README, added requirements files for py2 vs py3
Merge pull request #347 from kaitlin/master

fixed green dot image on vendor page
fixes #346 and footer layout tweak
Merge pull request #348 from kaitlin/master

fixed selenium tests
Merge pull request #345 from 18F/fix/pool-title-race-condition

possible fix for #324
fix #319
Merge pull request #349 from 18F/fix/employee-count-commas

Add commas to number of employees (fix #319)
Merge branch 'master' of https://github.com/18F/mirage
Add circle.yml, circle local_settings, deployment script and readme badge
Merge pull request #350 from dlapiduz/circle

Add Circle CI config
fixes 346, 334, 333, 320, 322
fixes search results margin/padding issue
fixes 323 word wrap
Merge branch 'master' of https://github.com/18F/mirage
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