Merge pull request #393 from insertinterestingnamehere/cython_wrapping

Further edits to the Cython Wrapping lab
Merge pull request #394 from insertinterestingnamehere/cython_wrapping

Cython Wrapping
Merge branch 'master' into f2py