Merge branch 'release/0.6.1'
Merge branch 'hotfix/0.6.2'
Merge branch 'master' of git://github.com/UCSD-ANF/puppet-antelope

Conflicts:
	README.md
Merge branch 'master' into devel