Merge pull request #1 from dschreij/master

Fixed numerous bugs, mainly in CLI operation
Update debian/changelog
Fix a bug when using /usr/share/datamerger
Merge pull request #2 from smathot/master

Fix to allow Ubuntu packaging