Experimenting with unsetting colorcolumn at buffer exit
Merge resolution
Added some html and javascript packages and nerdcommenter
Merged in remote
Fixed merge