Tweaking auto complete for IPython notebook
Stop ESS from turning underscores into assignments
Merge remote-tracking branch 'origin/master'