Merge pull request #70 from prep/master

Add a File.join method