Updated several files. Cleaned up unused lines.
Updated vim config for plugins and other tweaks