tweaks to 3.0
Merge branch 'master' of ssh://github.com/deian/nsdi2014