Make sure spaces do not affect filenames

There was a problem with the file_dictionary keys. It turns out that
spaces were carrying over from base name stuff for some reason. All
that needed doing was stripping that. I need to remove all the stuff
not necessary for version0.1 and branch.