Added Travis config (based on cfg from Catalyst)
Merge branch 'master' into travis