Added debugging support for a fake homedir.
Also removed some old code that I accidentally added back in.