:edit! without argument reload current buffer
Change autoinfo option to be an integer, allowing different levels
Add docstring for normal mode commands and display them if autoinfo >= 2
Fix select_number
Rename ColorPair to Face and ColorRegistry to FaceRegistry

Face also stores the attributes
highlight '$' identifiers
Support attributes in face specifications
Rename :colalias to :face and update documentation
Refactor RegexColorizers face handling
Rename RegexColorizer to RegexHighlighter
Do not resolve faces in highlighter factories, defer to actual highlighting
Use a region for c++ macro highlighting
Rename 'macro' face to more general 'meta'

As it is used in python/ruby for 'import' which is not really
a macro.
Merge remote-tracking branch 'alexherbo2/javascript-rc'
add rc/html.kak