Add pry for development group
update travis-build
add pry and update gems
Merge branch 'master' into staging

Conflicts:
	Gemfile.lock