Quick Routing Bug Fix

This should be pretty straightforward. 5 virtual peanuts to the first
reviewer:

http://rails.lighthouseapp.com/projects/8994/tickets/1375-fix-reserved-options-in-optimized-named-routes#ticket-1375-1

Alright, let me try again. Did you know that:

film_url(@film, :protocol => 'https')

doesn't work? Does that sound like it might blindside you at some
point in the future? Check out my patch.

Sorry, I actually had that in a local branch! Applied and merged to 2-2