builder changes, libxml2 cleanup
Merge branch 'master' of https://github.com/systemdatarecorder/builder