Fixed the delayed job constant in biocat_main.rb and switched to using annotations gem instead of plugin
Merge remote-tracking branch 'origin/rails2.3.18' into rails2.3.18
Tidied up the Gemfile