Add some gitattributes
Merge branch 'master' into mac
Merge branch 'mac' of github.com:rinx/dotfiles into mac