Updated after OSDI 14
Merge branch 'master' of github.com:ddevec/cv