Normalize paths on more spots
Merge branch 'master' of https://github.com/maxscheiber/cumulonimbus