Pep8 compliance fix.
Vim grammar, with dynamic modes for command/insert.
Switched file content, oops.