reorganized code a bit to follow style
added tests for weapon item
Adding 2.0.0 for travis to test