Replaced functional dependencies with type families
Merge branch 'master' of https://github.com/CurtisMcKinney/Generator