Set the folder permission before we try to use it. And some formatting tweaks.
Merge branch 'dev' into features/fileoutput_folderperm_fix
Merge pull request #319 from mozilla-services/features/fileoutput_folderperm_fix

Features/fileoutput folderperm fix