Merge branch 'master' into public_path_issue

* master:
  Fixed bug with html_helpers_test failing. Updated CHANGELOG
  - Updated changelog
  Generated DataMapper models no longer extend DataMapper::Base, but 
  rather 'include DataMapper::Persistence'. This corresponds to the 0.9.0 
  upcoming release of DataMapper.
  Added:
  revert previous changes to routing system
  oops, missed these 2 test files
  Two changes:
  Updated initializer (again).  This time it will only require the 
  default_controller.rb file if the file exists in the app/controllers 
  folder.  This way, we won't be forcing developers to use that file.
  Updated comment.
  Updated initializer so that it will require default_controller before 
  requiring other files in app folder.