updated modulefile
puppet 2.6-ified
cleanup