Add setting for show tab, newline, etc...
Add mapping for nohilight
Merge branch 'master' into mac