And so it goes..

* Got rid of tests that checked for thrown errors if weapons were not
melee or ranged
* Continuing table name refactor