Merge pull request #4 from alexouzounis/IntegrateImprovements

stop relying on the SubverstionTagAction and use the Module Location and
make sure we check for conflicted_unresolved as well as conflicted when
merging. Also add a fail safe such that if we fail to commit, a revert
occurs.
Merge pull request #21 from alexouzounis/RevertRebase

Make sure we revert if rebase goes south