vanity-pages WIP
skeleton page, fix search issues, etc
user tiles, some editing, better layout
forgot one
initial activity stream work

- track on public maps/layers
- track use of a user's layers
- tests for somethings
- use about storyteller in links
- add django mailer for async emailing
- notification UI
Merge branch 'vanity-pages' into integration

Conflicts:
	settings.py
	views.py
vanity-pages WIP
skeleton page, fix search issues, etc
remove print stmts
user tiles, some editing, better layout
forgot one
remove print stmt
minor
Merge branch 'actstream' into integration

Conflicts:
	settings.py
	views.py
user tiles, some editing, better layout

Conflicts:

	templates/mapstory/orgs/org_page.html
	views.py
fix bunk merge
Merge branch 'vanity-pages' into integration

Conflicts:
	admin.py
	settings.py
	templates/mapstory/orgs/org_page.html
	views.py
Merge branch 'master' into integration

Conflicts:
	settings.py
	templatetags/mapstory_tags.py
Merge branch 'master' into vanity-pages
Merge branch 'master' into integration

Conflicts:
	templatetags/mapstory_tags.py