Add 2 more weapon profiles, formatting cleanup

Add 2 more weapon profiles, formatting cleanup
Merge pull request #123 from feltz916/master

Add 2 more weapon profiles, formatting cleanup, add some default values