10 stable travis

Changes:
Appropriate .travis.yml for 10-stable build structure
Manual integration of: https://github.com/josephrdsmith/chef/commit/e8a942e85785c63516cef88b209071832fc9b87e  - dan's fix in master.