Removed temporary vim files from tree
Merge branch 'master' of github.com:teddyphreak/salt-nrpe