Merge branch 'doc-magic-who' of https://github.com/sramana/ipython into magic_who

gh-pages.py no longer updates index.rst

Merge branch 'docs-build'

Use * for bullets instead of -

Various tweaks to documentation and formatting.

Wrote example for %history Work done as a team by: -Srinivas Vinay A L -Vishnu S G

Wrote examples for %cdmagic Work done as a team by: Anuradha Beetoju Adish Naveen Shravan

Add example for %pwd magic command.

Merge branch 'master' of https://github.com/dwyde/ipython closes gh-203

Merge branch 'kernel-logging' of https://github.com/omazapa/ipython into omazapa-kernel-logging Fixed conflicts arising from updates to using session send instead of directly accessing the sockets. Conflicts: IPython/zmq/iostream.py IPython/zmq/ipkernel.py