Added Travis testing badge
Merge branch 'master' into docs