Blegh, I can't even figure out how to pull files from an upstream repo :|