Reduce amount of copypaste in __draw_token
Consistently use wrappers for vim commands
Fix line wrapping, indentation. Use named arguments for clarity.
Merge pull request #18 from borman/refactor

highlight.py refactoring