Minor SKV fixes
PersistentMap: perform simpler test first
Fix linking against skv
Disable skv test for now
Another skv link fix
Merge pull request #157 from eile/master

Fix linking against skv