Update locations of javascript files for IPython update
Add debugging info
Merge branch 'master' into ipython-1.0
Merge branch 'master' into ipython-1.0

Conflicts:
	web_server.py
add trial version of string decorators
adjust javascript paths
add a default decorator for string decorators
fix string decorators to recognize any callable expression (with parens, brackets, and dotted names)
string decorators come *first* in transformations
Merge branch 'master' into ipython-1.0

Conflicts:
	Makefile
Remove string decorators (moved to Sage installation)
Change canvas3d to point to the git sagenb location
Merge branch 'master' into ipython-1.0
Fix interacts and new files with the new IPython.

IPython commit d7db8e492 changed the user_expressions return format to a rich data display, so we had to update that.

For new files, we weren't including the payload dictionary in interact updates, and the message handler wasn't acting on new files.  Also, now we send an update message with every control update, whether or not the interact is actually run, so we now make sure we actually have new files before pulsating the file list.
Fix typo in namespace deletion
Initial port of William's exercise string decorator
update spkg-making script to use the git Sage with ipython 1.0 and sage patches applied

Also now require the optional pyzmq/zmq packages to be installed.
Merge pull request #410 from jasongrout/ipython-1.0

Require IPython 1.0