changes to fulfill filename convention
cosmits on filename convention
only one loop across conditions
only one loop across conditions
cosmits
Merge pull request #57 from jdammers/preproc

Changes to fulfill the filename convention. Some bug fixes and removal of redundant code.