moved some things around

Had all mixed up in my keymaps. gross.

Updated filetypes to not worry about augroups since ftn