tbt199 Merge remote-tracking branch 'origin/master' into tbt199
# Conflicts:
# Gemfile
# Gemfile.lock
Join over 500,000 developers testing and building on Travis CI
# Conflicts:
# Gemfile
# Gemfile.lock