Merge pull request #17 from ferrix/deps

Depend on a non-explicit version of mock
Fix amateur mistake with version when no Git present