modify cookie[]= to support extra cookie options

Using the syntax `cookie[:key, :options => 'hash']='value'`` will now
merge the provided hash with the existing @options hash (which allows
for changing cookie options on a per-cookie basis).
Merge pull request #66 from kylewlacy/master

Modify cookie[]= method to support additional options