fixing backspace weirdness on prompt. -- appears to be caused by tab
Merge remote-tracking branch 'origin/master'