Merge pull request #14 from friccita/master

Just to be thorough
Merge pull request #15 from friccita/master

Fixed conflicts
small bug fixes and switch to use of deltaPhi function instead of calculating it ourselves
fixed bug in which dPT instead of dPhi was selected on
commented things out to remove compiler warnings
bugfix
no change
Merge remote-tracking branch 'upstream/master'
Edits to allow efficiency code testing, changes to batch queue commands, some new plots