Merge branch 'fix_404_annotator_missing_ontology' into v3.14
Merge branch 'fix_search_popup' into v3.14
Upgrade Rails in Gemfile, environment.rb, run bundle install
Use new method for generating CSV to match Ruby 1.9.3
Merge branch 'fix_analytics_controller_CSV_api_changes'