Code cleanup and minor refactors

[jaxbot]

[hutson]

Not sure it's related to this specific issue, but this is a rather interesting article on how to call python from a vimL file, without including the Python code in the actual vimL file.

Perhaps it's a way that at least the Python code can be pulled out and developed, and tested, in isolation.