refactored some dice code
fixed some magic numbers and extracted repeated code into macros
Merge branch 'master' of https://github.com/Databean/warsofcatan into refactor_and_test_dice
switched a map emplace call back to insert for Travis
fixed one more magic number
added nothing at all
Merge pull request #31 from Databean/refactor_and_test_dice

Refactor and test dice
Merge branch 'master' into DevCardUImerger
Serialization is up and running now