Conflicts: Modulefile README.markdown manifests/init.pp spec/spec_helper.rb
add support for Ubuntu quantal and raring