More changes to get windows to compile through TravisCI
More changes to get windows to compile through TravisCI

collin80/SavvyCAN,collin80/SavvyCAN,collin80/SavvyCAN,collin80/SavvyCAN,collin80/SavvyCAN