update plotting
Merge branch 'master' of https://github.com/jkunkle/usercode
a few updates
fix conflicts
update photon selection code