better folder tags

This bugged me from the beginning... esp since my folders are descriptive multi-word folders.

I believe this change leaves the default functionality untouched -- just adds an option to handle folders better if desired.

It also leaves _ and . in folder name tags... that could be modified, but I assume if a user is uploading from organized folders, they have the names the way they want the for a reason.