Merge branch 'master' of git://github.com/ipython/ipython into qtfrontend

Merge branch 'kernelproxy' into upstream_master

Work on the kernel manager.

Adding unit tests for Qt console frontend.

Adding __init__.py files to new package directories

Fixed imports and removed references to ETS/EPD

Initial checkin of Qt frontend code.

add frontend/kernel communication diagram to docs

Fix broken link and remove spurious copy of file with wrong extension

Add Git workflow docs from Gitwash. These are auto-generated docs from the gitwash template. To improve anything in the gitwash/ directory, please go instead to that project and make your improvements upstream: http://github.com/matthew-brett/gitwash