Definition tweaks to allow building from Visual Studio 2012
Missing comma in item group definition
Updated weapons to have diamond edge instead of being fully diamond. Added necessary base weapons to recipe. Adjusted indentation to use spaces instead of tabs.
Merged changes in mapgen.cpp
Merge branch 'master' of https://github.com/OvenBaker/Cataclysm-DDA into OvenBaker-master
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA