Upgraded to Rails 4 and Ruby 2.0
Merge branch 'rails4'