ignore .DS_Store files
Merge branch 'master' of github.com:saz/puppet-ssh