Fixing travis key.
Merge branch 'master' into chef-11.4