Fixed (for sure) derpy file stuff

Git derped and somehow duplicated a file on the remote origin (maybe
because I had two git clients open?). It apparently failed at merging the
two files together and I had to go and fix the mistakes manually. Grrr....
Sometimes I don't know about git