Cleaned up lots of syntax issues and minor mistakes reported by puppet-lint