Update for language changes
Merge pull request #3 from pcwalton/directory-shuffle

Update for directory shuffle