Fixes #2431, #2452, a little bit lex talionis, but appropriate, I think.
Fix #2458 - Options are not attached to views.
Merge pull request #2460 from braddunbar/view-options

Fix #2458 - Options are not attached to views.
Dispense with View#options merging.
Merge pull request #2461 from braddunbar/view-options

Dispense with View#options merging.
Merge pull request #10 from documentcloud/master

上游合并