Lab: NumPy II

A continuation of the Numpy lab.
Merge branch 'develop' into numpy2
remove stray line from old merge
Merge branch 'master' into numpy