Allow Escrima, Silat, and Fencing to use more weapons

Also alphabetized the allowed weapons lists and removed some weapons that didn't make sense.
Tweaks

Removed the crude and 2-by-sword from Fencing, and the trench knife from Eskrima and Silat.
Merge branch 'patch-7' of https://github.com/Izicata/Cataclysm-DDA into Izicata-patch-7
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA