Merge remote-tracking branch 'origin/master' into 75075362-login-v2-personas

* origin/master: (22 commits)
  [76299648] Remove SASS-generated CSS files, update .gitignore accordingly.
  [76299648] Initial refactor to use SCSS.
  Remove business info from browse page, until it works.
  [76299648] Begin SCSS refactoring, add Meyer reset.
  A couple more DRYed up pieces
  Some DRY
  Fix up chevron
  Change variable names to be clearer
  Unbreak header sort
  Add ability to click entire row on the browse page
  Add some tests
  Cleaning up some print statements
  Pagination, styling work for browse page.
  Templating work for sorting bits.
  Basics of sorting. Still needs templating work.
  Show basic browse page, including date filtering
  Counts fire calls by address
  Add basic browse page bones
  Listen from all addresses
  Update logging on gunicorn
  ...

Conflicts:
	app.py
	models.py
	static/main.css
	static/main.js
Move model import after db import.
Record an audit log for all non-static pages
First pass at audit log viewer
Merge remote-tracking branch 'origin/75075362-login-v2-personas' into add-audit-log

* origin/75075362-login-v2-personas:
  [75075362] Quick CSS adjustment for login link readability.
  [75075362] Remove unnecessary kwargs from home routing.
  [75075362] Restrict 'browse' page access to logged-in users.
  [75075362] Add redirect handling.
  [75075362] Move models import to after db.

Conflicts:
	app.py
	models.py
	static/main.js
Audit log viewer.
[77658580] Add footer and initial CfA copyright.
[77658580] Style footer, standardize header and footer backgrounds with a variable.
Merge branch 'master' of github.com:codeforamerica/spot-it-like-its-hot into add-audit-log

* 'master' of github.com:codeforamerica/spot-it-like-its-hot: (41 commits)
  Do not automatically run functional tests
  [77656772] Link Streetview to Google Map (non-Streetview), opening in a new window.
  [77656772] Add Google Streetview to address page.
  [77672696] Add a place for the user's picture or icon.
  [77672696] Display the user's name in the upper right corner.
  Remove debug line
  add more waiting
  add implicit wait to login testing
  Unhappily add a wait to ensure tests pass
  [76825810] Log user out after 15 minutes of inactivity.
  Update tests to run in IE8
  Switch configuration to account for login
  [75075362] Add user email to browse page, consolidate the way it's pulled.
  Add trim shim to fix tests
  Update javascript and hopefully remove an error
  Clean up hub_url
  Fix spelling error
  Environment variable fiddling
  Try modifying config a little more
  Try another take at sauce connect
  ...

Conflicts:
	app.py
Add flag to disable audit logging
Merge branch 'action-station' into add-audit-log

* action-station:
  Clean up some accidental changes
  Add tests
  Add Seasurf requirement
  Styling: clean it up
  Comments work, the start of testing
  First stab at posting new comment, showing action station based on existing comments.
  Add action models
  finish resolving conflicts
  starting to style

Conflicts:
	app.py
	models.py
Adjust alembic to add audit log after actions
Add tests for the audit log
Merge branch 'master' of github.com:codeforamerica/spot-it-like-its-hot into add-audit-log

* 'master' of github.com:codeforamerica/spot-it-like-its-hot:
  Remove duplicitous template comment
Require login for viewing the audit log.
Who will watch the watchers?
[77658580] Merge master.
[77928456] Update 'Hotspotter' to 'AddressIQ'.
Various fixes
Add email field to audit log page