Updated to Rails 4.0.0 with Ruby 2.0 compatibility

Rails updated to 4.0.0
Makeup gem needs explicit require of "makeup/markup"
Railties requires activeresource gem now separately (not included in Rails 4 by default)
Rails 4 no longer uses an :assets group