Merge pull request #2 from kerneis/master

More reliable and complete build script
Build convert-block branch
Update benchmark scripts to use my QEMU git tree