Changed history from 1000 to 100.
Added colorcolumn for 80 chars
81 minimum window width
Merge remote-tracking branch 'origin/master'