Misc fixes for scala 2.10
Merge pull request #55 from adamdecaf/sippy-fixes

Misc fixes for scala 2.10