Merge branch 'master' of github.com:jrolfs/dotfiles
Added .gitattributes