Since e5a73815 excerpt requires a hash for options

HighlightHelper#excerpt backports the Rails 4 excerpt which
requires a Hash for the options parameter rather than globbing
the remaining arguments.
Merge branch 'excerpt-args' into rails-3-develop