updates to Numpy scipy
Merge branch 'gh-pages' of github.com:swcarpentry/2014-04-14-wise into gh-pages
Small edits to notebooks, add joins to Pandas
Merge branch 'gh-pages' of github.com:swcarpentry/2014-04-14-wise into gh-pages