These changes shouldn't be in the master branch.  I'M SORRY I SUCK AT GIT.