Committer: Craig Kelly <craig.n.kelly@gmail.com>
Windows compatibility (mainly increasing use of os.path calls)