updated to include travis build badge
Merge branch 'develop'