Add our stuff back

Brings us back to the same state as before, but now up to date with inkling
 - focus tests envvar
 - more logging helpers (async, debug, error)
 - xpretty option
 - disabling inconsistent state check

@j-mutter