v0.1.16

The next release!

- mergeOptions is now attached to Marionette, and not classes
- refactors to directory structure of the source