Merge remote-tracking branch 'upstream/master'

Conflicts:
	opentreemap/treemap/models.py
	opentreemap/treemap/views.py
Add in basic auditing proof of concept