checkin prior to rails 4 deploy
Merge branch 'rails_4'