Minor changes, mostly to ignore file
Merge branch 'master' of https://github.com/jalli/dotfiles

Windows end of line mess
Merged Win and Linux versions