(sort of) Closes #110.
Merge branch 'master' of https://github.com/TAXIIProject/libtaxii