Change comment header style and new options
Add ls color and directory up shortcuts
Change comment header style
Add search and diff color
Change comment header style and add and remove options
Resolve merge conflict