Minor changes to several files while adjusting and tweaking VIM workflow and setup