Ensure map options are respected after free-drawing polygons

Resolves #952.

It's a bug fix, because there was already code in there to revert the map options after drawing, but it wasn't quite working the right way.

Changes:

* Use `@oldOptions = map.getOptions().options` instead of `@oldOptions = map.getOptions()`.
* Use `@map.setOptions _.defaults @oldOptions, enabledMapOptions` instead of `@map.setOptions _.extend @oldOptions, defaultOptions`.
@nmccready Okay, so since you are considering removing `getOptions`, should I do `ctrl.getScope().options` here (as originally discussed in #952)? I only used `getOptions` because `setOptions` is used in the surrounding code.