rake rails:update:bin
Added minitest gem
merged master with ruby 2.0 into rails 4 branch
Merge branch 'rails_upgrade_4.0'

* rails_upgrade_4.0:
  merged master with ruby 2.0 into rails 4 branch
  Added minitest gem
  rake rails:update:bin