Change color according vi mode & edit bindings accordingly
move prompt settings out of prezto
fixup the typo in settings/bindings introduced with 1c96a1a5363f7d5ec4369ed24451cb27df2e807d
Merge remote-tracking branch 'origin/master' into laptop