Fix tests and update gitignore.
Ignore settings.json as it is ENV specific.
Merge branch 'master' into mocha-web