Update to include non-plugin vim config
Clean up old plugins