Minor fix for mixin parsing

Fixed a typo and tweaked the code a little bit.
Fixed column alignment
Updated specs to cover new features
Fixed wrong method name for logging setup
Merge pull request #24 from arax/mapping

Extended test coverage