minor fix

KATO

MEGA RELEASE

Smithers my good man!

to the forge!

Puppetconf 2014 release!

Duckworth away!

Cut a 1.0.1 with a couple minor bug fixes on top of 1.0.0

1.0.0 release - Edgar

Merge remote-tracking branch 'origin/recovery'

Conflicts:
	Modulefile