fixes nil username bug and redirect if age inappropriate bug
fixes bug if merging account without terms agreed to
makes username without the @ redirect to @username
Merge branch 'master' of https://github.com/DateEdge/website