pull and sync
Merge branch 'master' of https://github.com/Tooblippe/zapycon2013_ipython_science