Merge branch 'add-activation' into add-business-and-activity-to-browse-page

* add-activation:
  Update alembic to be in a sane order
  Remove sauce connect until we have Selenium tests working
  Add activation/deactivation to action station
  Fix last bit of weirdness from merge conflict
  Rogue merge conflict
  Add tests to basic functionality
  Add model for activated addresses
  Toggle properly toggles.
  Add migration
  The rest of activation, pending tests and styling of the toggle.
Add business status, active status to browse page
Merge branch 'add-activation' into add-business-and-activity-to-browse-page

* add-activation:
  Cleanup per @fureigh's comments
  Fix up tests
  Tweak top bar
  Collect up colors into variables
  Some style improvements

Conflicts:
	templates/browse.html
Adjust styling with new fields
Merge branch 'master' of github.com:codeforamerica/spot-it-like-its-hot into add-business-and-activity-to-browse-page

* 'master' of github.com:codeforamerica/spot-it-like-its-hot: (64 commits)
  Friendlier gitignore
  Fix up tests
  Revert "Another take at buffering"
  Update README to call the app AddressIQ.
  Make all actions case insensitive to address
  Make sure to strip after removing CLB
  Merge CLB addresses on browse, address pages
  Another take at buffering
  Try smaller batching
  Buffer inserts
  More friendly transformation script.
  Make transformation less initially forboding
  More consistent style on transformation
  Clean up comments
  Structure + first scripts for cleaning up data
  Add CSRF to login
  Clean up https on homepage
  Style tweaks to the homepage.
  [78321400] Add logo asset.
  fix up tab styling
  ...

Conflicts:
	count_calls_for_service.py
Fix order of alembic versions.
Merge pull request #29 from codeforamerica/add-business-and-activity-to-browse-page

Add business and activity to browse page