Update to IPython master (soon to be 3.0)

Hi all,

Sorry I haven't been keeping this repository as up to date as I should have been.  I didn't realize it would be so popular.

This commit contains some much needed TLC.  It also updates everything for IPython master, which will soon be released as IPython 3.0.

Cheers,
Jon