Added --single-branch to git branch clones
Merge branch 'master' into for_puppet
Test using dump instead of import scripts