update metadata editor with new text and help links
Merge pull request #905 from drwelby/master

update metadata editor with new text and help links
welcome email follow up fixes

- fix computation of users to send to
- add site prefix to template
- remove old templates
- tests
Merge branch 'iss-830-flag-improvements'

Conflicts:
	links.py
	templatetags/mapstory_tags.py
Merge branch 'master' into integration