Update to the new traits.adaptation functionality.
TravisCI: envisage should be tested against the latest 'traits' master
Merge pull request #25 from enthought/adaptation

Adaptation