Fix pythonstartup for IPython
Add edit-command-line binding
Fix for kerrit
Merge branch 'master' into knewton