cleanup and some refactoring
minor corrections
minor updates
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/wikimediadc/nara-auth