Long time no see, gotta get back into the habit of updating this... :)
Updated Vim submodules
Attempting to merge older changes
Merging changes and cleanup