Fixed various bits of git cruft...