Added more merge strategies.
Ticket #107
Merge branch 'master' of github.com:cr0hn/golismero
Rollback, we need --max-threads for later.