remove deprecated config values
Merge branch 'master' into devise
remove deprecated config values
Merge branch 'master' into devise
move listen gem to test group
merge master