Support options style config

This adds support for the standard 'options' style config while maintaining 'naked' style support for anyone who's already using the plugin. Fixes #13.

I also included a minor code optimization. Feel free to take one commit without the other.