Merge branch 'master' into yak-shaving
Increase landscape.io health

- Replacing "from pylab import *" with "import matplotlib.pylab as plt"
  left over some problems regarding 'plt' and 'numpy'
Fixed whoopsie
Rename color options in beam propagation function
Merge branch 'yak-shaving'