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
Merge pull request #59 from WmoT/develop

Any error in a feature should fail immediately.
cleaning up some bad tests
fixing more tests
add --version cmd line
add method to include git commit hash to sprint --version output
update default VERSION
Using setuptools version of sprinter instead of using git describe since that introduced too many dependencies that could fail an install.
Merge pull request #61 from staylor32/develop

Display sprinter build version.
moving exceptions back to where they belong
If fail in remove(), continue rest of feature removal instead of raising SprinterException