fix pry for rails 4 and ruby 2
Merge branch 'master' of github.com:DainisL/irb-config

Conflicts:
	Makefile
	irb/pry_loader.rb