Improve puppet module removal - Issue #141

According to issue #141