Bumping version and modifying travis CI file
Merge branch 'develop'