added base template var
Merge branch 'analytics-dev' of github.com:sunlightlabs/django-locksmith into analytics-dev
Merge branch 'analytics-dev' of github.com:sunlightlabs/django-locksmith into analytics-dev
Merge branch 'analytics-dev' of github.com:sunlightlabs/django-locksmith into analytics-dev
made tags optional on api
Merge branch 'analytics-dev' of github.com:sunlightlabs/django-locksmith into analytics-dev

Conflicts:
	locksmith/hub/models.py