updated travis badge
Merge branch 'develop' of github.com:CenterForOpenScience/waterbutler into feature/filewrapper-and-streams