Update Gemfile
Update .travis.yml
Merge remote-tracking branch 'origin/develop' into dev/writers