this time with files
Merge branch 'master' of https://github.com/claussen/dotfiles