ipython html
removed ipython files from hypoth branch (all on ipython-work branch)
Merge branch 'master' into hypoth