nearly final
Merge branch 'master' of https://github.com/blackandcold/PR_Quantumoptics_Summer2014