new branch, command line frontend
Merge branch 'master' of https://github.com/ipython/ipython into newfront
frontend prompt work
fixed bugs command line to frontend
command line bugs
blah
Merge branch 'newfront'

Conflicts:
	IPython/frontend/html/notebook/static/js/projectdashboardmain.js
bugs
lots of bugs
Merge branch 'newfront'