Feature/weapon table tidying

AMS is now present in the ammo table. Attempted a bit of tidying in the weapon table. Fix for #169 .