Use path.join for paths

@kevinsawicki can you merge this and publish when you get a chance?