Service update.

Changed OfKind --> KindIs
Added support for ClosedTypeFamilyD
Small wibbles to todo.

Not yet ready for release because of GHC #8031.