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