attempted fix in ID generation for merges
Merge branch 'master' of github.com:proycon/valkuil