Merge pull request #29 from TensionVex/master

removed extraneous text from file names, removed dupes, moved frank2, ja...
foodsiren and supertoot by tension vex