Changed the way require rdoc is written to suit new rdoc version requirements
removed validates_url gem as not compatible with rails 3 and specified factory_girl version
New files added from running Rails new
Removed will_paginate and better_logging from plugins and added as gems
Merge branch 'rails3' of github.com:myGrid/biocatalogue into rails3
Removed exception_notification plugin and replaced with gem
Move oauth-plugin to gem form and move template inliner
Disabled url validation as plugin is incompatible with rails 3
Commented out action_controller/test_process
Named module back to BioCatalogue from Catalographer
Added some requires for country_codes, cache_helper and util; and changed the order of a few statements
Renamed module from Catalographer back to BioCatalogue
Disabled action_view.debug_jrs as it was causing errors when running server
Added prototype-rails Gem
Renamed BioCatalogue back to Catalographer
Changed the path of template_inliner plugin
Changed RAILS_ROOT constant to Rails.root
Removed template inliner as both incompatible with rails 3 and unused
 Replaced instances of RAILS_ROOT and RAILS_ENV with Rails.root and Rails.env
 Replaced instances of RAILS_ROOT and RAILS_ENV with Rails.root and Rails.env