diff --git a/.vim/after/plugin/UltiSnips_after.vim b/.vim/after/plugin/UltiSnips_after.vim
deleted file mode 120000
index 5771b77..0000000
--- a/.vim/after/plugin/UltiSnips_after.vim
+++ /dev/null
@@ -1 +0,0 @@
-../../bundle/ultisnips/after/plugin/UltiSnips_after.vim
\ No newline at end of file
diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 0df7a89..5269fb1 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -29,14 +29,14 @@ augroup END
 
 au! BufNewFile,BufRead *.pde setf arduino
 
-augroup org
-  " leave these as is:
-  au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
-  au BufRead,BufNewFile *.org            call org#SetOrgFileType()
-  au BufRead *.org :PreLoadTags
-  au BufWrite *.org :PreWriteTags
-  au BufWritePost *.org :PostWriteTags
-augroup END
+"augroup org
+  "" leave these as is:
+  "au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+  "au BufRead,BufNewFile *.org            call org#SetOrgFileType()
+  "au BufRead *.org :PreLoadTags
+  "au BufWrite *.org :PreWriteTags
+  "au BufWritePost *.org :PostWriteTags
+"augroup END
 
 au BufNewFile,BufRead motd.public,/tmp/motd.public.r.* setf motd
 
diff --git a/.vim/ftdetect/UltiSnips.vim b/.vim/ftdetect/UltiSnips.vim
deleted file mode 120000
index 36d1c2c..0000000
--- a/.vim/ftdetect/UltiSnips.vim
+++ /dev/null
@@ -1 +0,0 @@
-../bundle/ultisnips/ftdetect/UltiSnips.vim
\ No newline at end of file
diff --git a/.vim/ftdetect/snippets.vim b/.vim/ftdetect/snippets.vim
deleted file mode 120000
index 1de3804..0000000
--- a/.vim/ftdetect/snippets.vim
+++ /dev/null
@@ -1 +0,0 @@
-../bundle/ultisnips/ftdetect/snippets.vim
\ No newline at end of file
diff --git a/.vimrc b/.vimrc
index ac35ad5..bce6364 100644
--- a/.vimrc
+++ b/.vimrc
@@ -67,8 +67,8 @@ set t_Sb=ESC[4%dm
 " ** FILETYPE SETTINGS **
 filetype off
 
-let g:ft_ignore_pat = '.org'
-filetype plugin indent on
+"let g:ft_ignore_pat = '.org'
+"filetype plugin indent on
 " If you prefer the Omni-Completion tip window to close when a selection is
 " made, these lines close it on movement in insert mode or when leaving
 " insert mode
@@ -132,10 +132,10 @@ autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags
 "au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
 "au BufEnter *.org            call org#SetOrgFileType()
 
-au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
-au BufEnter *.org call org#SetOrgFileType()
-command! OrgCapture :call org#CaptureBuffer()
-command! OrgCaptureFile :call org#OpenCaptureFile()
+"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
+"au BufEnter *.org call org#SetOrgFileType()
+"command! OrgCapture :call org#CaptureBuffer()
+"command! OrgCaptureFile :call org#OpenCaptureFile()
 
 " Cull trailing whitespace for all files.
 autocmd BufWritePre * :call AutoTrimWhitespace()
@@ -244,8 +244,8 @@ let g:CommandTMaxDepth = 7
 " let g:org_todo_setup='TODO | DONE'
 " while g:org_tag_setup is itself a string
 "let g:org_tag_setup='{@home(h) @work(w) @tennisclub(t)} \n {easy(e) hard(d)} \n {computer(c) phone(p)}'
-au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
-au BufEnter *.org            call org#SetOrgFileType()
+"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+"au BufEnter *.org            call org#SetOrgFileType()
 
 " * Airline
 set noshowmode