update git core.autocrlf
Merge branch 'master' of github.com:kui/dotfiles
add ignored hosts
Merge origin/master into local master
Merge origin/master into local master