Bump travis-build
Update travis-build
Update travis-build
Add pry for development group
update travis-build
add pry and update gems
update travis-build to remove the fix ssl update
Merge branch 'master' into osx-production

Conflicts:
	Gemfile.lock