fixed typo
.travis.yml file is out of date, auto-updating .travis.yml file.
fixed typo
Merge branch 'master' into deprecate_usersettings
fixed test