merging with upstream
updated at CITA
Merge branch 'master' of https://github.com/NatalieP-J/Summer2014
Produced eventually unused presentation plots