user and admin updates
Merge pull request #50 from pfletch1023/rafi

User page changes
emails, etc.
Merge pull request #51 from pfletch1023/paul

Email and Subscriber edits
merged paul