Cleaned up some puppet-lint issues.
Updated the project files to account for some of the earlier changes.