no accidental overrites
Merge branch 'master' of github.com:kra3/dot_files