Merge branch 'amatellanes-master'
version bump and merge in contributions from amatellanes
travis
Merge branch 'master' into test
Merge branch 'test'
updated travis.yaml
updated travis.yml