Uses multimerge
disable travis IRC
Merge pull request #399 from twitter/feature/useMultiMerge

Uses multimerge
Merge branch 'develop' of github.com:twitter/summingbird into feature/ackOnEntry