clean README
company-mode and evil
upgrade evil
Merge remote-tracking branch 'upstream/master'