mixin refactor
add tests
version bump
Merge pull request #20 from HenrikJoreteg/mixin-refactor

Mixin refactor
merge in latest master; dont clobber a templates namespace if it is included in multiple directories
add test