Add autocmds for various file types; general clean up