upgraded to rails 4 with wize_upgrader
Continue fix on Rails 4 upgrade
Add Rakefile back...