Implemented johns settings page
Merge pull request #4 from jdpagley/master

Implemented johns settings page
Merge remote-tracking branch 'upstream/master'
updates for portal views