Update routes to prepend locale to url path. Simpler with Rails 3.
Added better_errors and binding_of_caller to development gems. Should make troubleshooting easier for our transition to Ruby 1.9 and any customizing.
Show detailed errors in development.
Removed duplicate line. Commented out Capistrano since we're not using it.
Trying to get tolk routes to work correctly. Simplifying some of the I18n locale stuff per the examples in http://guides.rubyonrails.org/i18n.html
Merge changes from BibApp/master (Ruby 1.9, Rails 3.2.6) int kumc-integration.
Removed brackets that were forcing array. Why was that there to begin with?
Moved activerecord_merge from vendored plugin to lib since vendor/plugins are now deprecated.
Only use English locale for now.
rcov not compatible with Rails 3.2. Use Tolk instead of BibApp/tolk which seems to be conflicting with something else.
Track Gemfile.lock.
Updated OmniAuth-CAS. Updated OmniAuth and OmniAuth-CAS configuration for OmniAuth 1.0. Fixed the redirect back to the origin page after login. Removed localizations from the url path for now since I can't get it to play well with the CAS redirection and callback.
Adds new initializer for ActiveRecord Merge. Forgot to add this to the earlier commit.
No need to require author_batch_load since it's moved to model.
Omit Tolk for now since it's not working correctly and getting in the way of running tests.
Ignore Solr index data.
Removing Guard and Spork-Rails for now. I can't get Guard/Spork to startup RSpec. It could be just a matter of changing the Spork config in spec_helper.rb, but it isn't clear enough yet and RSpec works fine without it.
Removed Solr index for test environment from Git.
Merge branch 'bibapp-head' into kumc-19
Updated duplicate merging tests to new Factory Girl syntax.