modified generate_spectrum to handle data files in clean_up
Merge remote branch 'origin/master'
Merge branch 'master' of github.com:ashleyrback/MajoRat
corrected a few errors when running on Feynman