updated gitignore
Merge branch 'master' of ssh://r2m/~/conf.d