edit
Merge branch 'master' of https://github.com/ewindahl/iPython_Notebooks