Adding filedir+random string to salt the filenames a bit more
Merge branch 'master' of https://github.com/olanmatt/hermes