make unoconv more convenient to use as a lib
Merge branch 'master' of github.com:alexgarel/unoconv

Conflicts:
	unoconv