Allow options param to override url options

This is useful if you want to set things like "filename" or "email".  You can still set the conversion options with something like:

```ruby
options = { options: [ ... ] }
```
Merge pull request #5 from theycallmeswift/patch-2

Allow options param to override url options