Merge branch '1.0.x'

Conflicts:
	Modulefile

diff --cc Modulefile
index 7b41839,52dede3..8a468ab
--- 1/Modulefile
--- 2/Modulefile
+++ b/Modulefile
@@@ -1,4 -1,4 +1,4 @@@
 -name 'puppetlabs/vcsrepo'
 +name 'puppetlabs-vcsrepo'
- version '0.2.0'
+ version '1.0.0'
  summary 'Manage repositories from various version control systems'
  description 'Manage repositories from various version control systems'