Allow underscores and hyphens in filenames
Unify static file / page attachment handling, and handle page files