gitignore
Merge branch 'master' of github.com:burke/dotfiles
merged linux conf