Merge pull request #1 from trishasalas/master

Various book-keeping things from @trishasalas
Merge commit '50c7824b23489f4bcf05c12c1ed08a982faba0f1' into trishasalas-user-profile-options
took trishasalas’ pull request and moved stuff around to the proper places
This moves the new options to above the Name section of the user profile page and removes the heading.

This is where we want these options to increase visibility.

Signed-off-by: Chris Reynolds <chris@jazzsequence.com>
Merge pull request #1 from jazzsequence/trishasalas-user-profile-options

Cleaned up your pull request