remove pry
Merge branch '2-3-stable' of github.com:conciergelive/rails into 2-3-stable