Added more config parameters and updated OAuth related parameters
Merge branch 'rogie'