clean copy of shapesmith from previous repo
Merge upstream