Merge pull request #27 from rnc/master

Added integration test and reverted a commit.
Better handling for invalid scm types