Lab: NumPy II

A continuation of the Numpy lab.
Merge branch 'develop' into numpy2
remove stray line from old merge
Merge pull request #298 from ayr0/numpy2

Lab: NumPy II