Import quote directly from urllib
Refactor, simplify and document parsedir
Clean up inifile functions
Merge branch 'master' into style_cleanup