(Issue #315) Making all authentication mechanisms honour the config state
(Issue #315) Code clean-up from self-review
Increase wait times for tests.
Add validator to getDirectRoles
Clean up
Merge branch 'master' into issue-315

Conflicts:
	node_modules/oae-authentication/lib/api.js
	node_modules/oae-authentication/lib/init.js
(Issue 315) Adding unit test for disabling local auth.
fix use of assert.ok when meaning assert.equal
fix test failures masked by using assert.ok as assert.equal
remove commented out validation check
use strictEqual and check defaultValue
Merge pull request #315 from mrvisser/issue-315

Make local authentication use config variable
Merge pull request #353 from stuartf/assertok

Accidental use of `assert.ok` instead of `assert.equal`
fix equality/identity operator
Merge origin/master and fix conflicts