Assorted cleanup and navigation fixing
Fix #24.
add 'none' option to which userprofile type so it can be turned off
temp commit
Merge remote-tracking branch 'upstream/master'
html makeup fixes