Merge pull request #5 from peterorme/master

Remove a reference to "longname" in director.rb
Merge branch 'master' into dev/gallery