Change 'change password' button to 'edit account preferences.'
Show username & points (optional) in sitepoints element; change navbar.
Merge pull request #1842 from bcipolli/1312

#1312: Compromise on home link, improving progress navbar link
Fix for #1854: Change "mastery of topics" to "progress report"
Merged Ben's changes and made FE revisions as necessary