Merge branch 'arrscipy' of git://github.com/ayr0/numerical_computing into scipy
Edits to scipy addition to arrays lab.
Merge branch 'master' into scipy
Merge branch 'scipy' of git://github.com/insertinterestingnamehere/numerical_computing into insertinterestingnamehere-scipy
minor edit

removed line that doesn't contextually fit.