Hmm, sorry about that, hadn't even heard of `git mv`. I should try and learn a few more commands over the summer to improve my workflow. I'll take a look tomorrow and try and make this diff less monolithic.