Changed string concatenation of paths to calls to os.path.join().