incorporates Roger's OAuth work, applies Matt's patches, reworks many features
updates comment notes
Merge branches 'develop' and 'master'