Reorganize some of the plugins in the vimrc
Fix some potential issues with filetypes in vim