diff --git a/vim/ftplugin/yaml.vim b/vim/ftplugin/yaml.vim
new file mode 100644
index 0000000..f7e8911
--- /dev/null
+++ b/vim/ftplugin/yaml.vim
@@ -0,0 +1,5 @@
+set softtabstop=2
+set tabstop=2
+set shiftwidth=2
+set shiftround
+set autoindent
diff --git a/vimrc b/vimrc
index 50ba296..c62a7bc 100644
--- a/vimrc
+++ b/vimrc
@@ -108,6 +108,9 @@ set ignorecase
 " unless search contains uppercase
 set smartcase
 
+set wildmenu
+set wildmode=longest:full,full
+
 " allow hidden buffers
 set hidden
 
@@ -372,12 +375,20 @@ nnoremap <leader>ut :UndotreeToggle<cr>
 
 " vim-project-tags
 source ~/.vim/bundle/vim-elhiv/elhiv.vim
+
 " override function so we can have custom tag names for built in languages
-function! project_tags#add_built_in_language_support()
-	call project_tags#add_language('.jstags', 'js')
-	call project_tags#add_language('.vimtags', 'vim')
-	call project_tags#add_language('.phptags', 'php')
-endfunction
+" function! project_tags#add_built_in_language_support()
+" 	call project_tags#add_language('.jstags', 'js')
+" 	call project_tags#add_language('.vimtags', 'vim')
+" 	call project_tags#add_language('.phptags', 'php')
+" endfunction
+
+" above function causes error (maybe autoloading problem when no
+" tags are being used or whatever?)
+" see if following three lines work instead
+call project_tags#add_language('.jstags', 'js')
+call project_tags#add_language('.vimtags', 'vim')
+call project_tags#add_language('.phptags', 'php')
 
 call project_tags#add_language('.csstags','css')
 call project_tags#add_language('.scsstags','scss')