BinPro/CONCOCT — pull request #51 by antagomir (2014-02-12 16:26:46+00:00)
Title: syncing with master

Ok, I have resolved the conflicts. Does it work now?