Project thief

With slightly less unsolicited breaking! 

Turns out the merge issue was, in fact, robots.dm. Merging it then broke literally everything else. Yay!