Fixed typo in ntp manifest
Merge branch 'master' of github.com:justin8/puppet
removed vim swap file
Added vim swap files to .gitignore