Partial commit to work around fucked up git weirdness

Signed-off-by: David Stewart Zink <zink@leftfield.org>
Checkpoint. Config sucks, about to rip it out.

...lessons learned

Signed-off-by: David Stewart Zink <zink@leftfield.org>