Any error in a feature should fail immediately.
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