Added Travis support
Travis badge
Merge branch 'master' into wip-enhancedtests