remove magic numbers, re-raise properly, rename makedirs_safe to makedirs
ignore .swp files
Merge branch 'master' into python32