Fixes before merging WH_pietro branch into master

[jreic]

Following #276, some suggested fixes were made, which we will take care of before merging into master:

• Store fewer variables to save on space: #276 (comment)
• Use vector's deltaphi: #276 (comment) (and all other instances of deltaphi)
• Remove a no-longer-needed line: #276 (comment)

[lucalavezzo]

This branch has now been merged into master.