Fixing reference to travis badges
Merge branch 'develop'