General cleanup, adding buffer swiching, moving evil mode later.
General cleanup, adding buffer swiching, moving evil mode later.