Merge pull request #1 from strafe/master

Update shavit.inc and bhoptimer integration

Author: shavitush

.travis.yml

@@ -5,7 +5,7 @@ addons:
         - lib32stdc++6
 
 env:
-    - SMVERSION=1.8
+    - SMVERSION=1.10
 
 before_script:
     - git clone https://github.com/splewis/sm-builder