Update git formula to not merge automatically (https://github.com/toumorokoshi/sprinter/issues/54).
fix bug in lib call, replace ',' with '%'
log merge conflicts/error at warn level instead of raising an exception.
Merge pull request #58 from staylor32/develop

Update git formula to not merge automatically