Updates from windows laptop
Merge branch 'master' of https://github.com/jesperes/initfiles