use account app settings to address #881
basic customization 401 tmpl, refs #891
follow up to 849f43f1, refs #881

make sure email account activation required to register
flagging improvements, refs #829 and #830

requires forked django-flag app to handle status on FlagInstance
and some admin interface
initial manual content for annotations csv upload

refs #874
flagging widget adjustments

- remove inappropriate option
- add placeholder text
- hide widget unless authenticated
Merge pull request #893 from drwelby/wikilinks

switch wiki links to template tags
Merge pull request #900 from drwelby/userwelcome

User welcome emails
Merge pull request #902 from drwelby/master

add back help link
Merge pull request #904 from drwelby/master

update test coverage for links
minor follow up to welcome email work

- only add test url if debug on
- fix view for testing
- fallback to username if first_name not set to prevent
  a blank from potentially appearing
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
remove errant print stmt
adjust from_email in welcome
more welcome email work, refs #568

fix a few minor issues and use inline styles for gmail
load mapstory_tags for wiki_url

pages were broken before as the tag wasn't recognized
better thumbnail language, refs #911

extract to templatetag, remove old warning tag/template and
use in both layer and map info pages
set max height on annotation popups see MapStory/mapstory/issues/885