bootstrap overhaul --

Didn't commit all of the files I asked to? WAT?!
Beautiful Short Sword