Merge pull request #365 from sonyandy/gixed-fundeps

Include p in GIxed' fundeps
convert GIxed to use type families