user welcome emails
fix typos
fix typos
more edits
update text welcome message
switch wiki links to template tags
Merge pull request #893 from drwelby/wikilinks

switch wiki links to template tags
test emails
finish merge
update to user welcome msgs
Merge pull request #900 from drwelby/userwelcome

User welcome emails
add back help link
Merge pull request #902 from drwelby/master

add back help link
update test coverage for links
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 branch 'master' into integration

Conflicts:
	links.py
	templatetags/mapstory_tags.py