Fix self.down for the AddUserTypesToBookmarksSearches migration.
Merge pull request #402 from jaronkk/patch-1

Fix self.down for the AddUserTypesToBookmarksSearches migration.
remove specific version dependency on sass-rails
add explicit dependency on the journey router gem (a dependency of Rails 3.2, but not 3.1)
remove dependency on Journey gem, work at the Rails-level instead by creating a proper dummy controller + routing
just test against catalog controller rather than trying to be too clever. maybe after Rails 3.1 support is dropped we can do an even better job here..
comment out the generated default_solr_document_parameters configuration, fixes issue #398
bump minor version to 3.4.0 to (maybe?) avoid versioning confusion..
remove action controller helper.. not sure it's doing us any good (anymore?)
mock rsolr request/response in the error test.. maybe the rsolr error#to_s started requiring more data?
tweak solr_marc.rake tasks so they don't try to look up paths if provided explicitly
Squash i18n commits together:

added i18n support

i18n blacklight_helper_behavior

i18n catalog helper behavior

i18n facets helper behavior

i18n search_history_constraints_helper_behavior.rb

don't uncomment the i18n lines from config/application.rb

various i18nineing

i18n folder views

Rev the en.yml blacklight translations

correct bookmarks notice output

make existing tests pass by reverting locales edits and using pluralization

i18n bookmark partials

i18n citation partial

i18n constraints partial

i18n did you mean partial

i18n document partial

sync en.yml

html-safe did you mean suggestions i18n

sync i18n yaml

i18n facet partials

i18n email form

promote tools to top-level

i18n catalog partials

sync en.yml

i18n catalog templates

sync en.yml

fix i18n labels so all tests pass

layout i18n

sms/email text

span_tag -> content_tag :span

i18n

merge saved searches i18n
i18n consistency
Remove errant whitespace
provide sensible defaults for BL show + index configuration (use the unique_key field by default)
implement ERb parsing of solr.yml, to allow ENV variables to be used in solr.yml (e.g. for hudson-assigned jetty ports)
update solr:marc:index spec to allow a wider range of ports
bookmarks.add_many => bookmarks.collection.add
fixes #333, provide a better exception if nothing is listening on the port RSolr tries to find Solr on
one stab at #385; adds :helper_method option to display field config, to call out to helper methods to get values to display