Update documentation to reflect changes in the way #display handles custom options.
Update documentation to reflect changes in the way #display handles custom options.

wycats/merb,merb/merb,benburkert/merb-core,wycats/merb,merb/merb,benburkert/merb-core,wycats/merb,merb/merb,wycats/merb,wycats/merb