Refactor to use configuration objects and bug fixes

We refactored internals to use configuration objects, and bundled a few bug fixes

1.2.3: Merge pull request #30 from kerrizor/github-29_stack-to-deep

Fixes a 'stack too deep' error caused by an autogenerated file mistakenly included in 1.2.2