Update rails 4.0.2 (plus do `bundle update`)
Merge pull request #165 from makimoto/update-rails-402

Update rails 4.0.2 (plus do `bundle update`)