Merge pull request #7 from inugent/Production_2014_Jan_21

Production 2014 jan 21
Merge pull request #8 from anehrkor/master

trigger paths and modules now human readable & removed obsolete paths
adding electron energy calibration