diff --git a/vim/ftplugin/yaml.vim b/vim/ftplugin/yaml.vim
new file mode 100644
index 0000000..e29aba1
--- /dev/null
+++ b/vim/ftplugin/yaml.vim
@@ -0,0 +1,2 @@
+set syntax=off
+
diff --git a/vimrc b/vimrc
index fb8d579..29db0d5 100644
--- a/vimrc
+++ b/vimrc
@@ -39,12 +39,13 @@ set ofu=syntaxcomplete#Complete
 " Mappings
 let mapleader=","
 let g:mapleader=","
-map <leader>rc :source $MYVIMRC<CR>
+map <leader>rl :source $MYVIMRC<CR>
 map <leader>nt :NERDTreeToggle<CR>
 map <leader>ss :setlocal spell!<CR>
 map <leader>ct :TlistToggle<CR>     " taglist shortcut
 map <leader>ts :%s/\s\s*$//g<CR>    " trim trailing whitespace
 map <leader>cc :CoffeeCompile<CR>   " Complie CoffeeScript
+nnoremap <leader>rc :split $MYVIMRC<cr>
 
 if bufwinnr(1)
     map <leader>+ <C-W><
@@ -53,9 +54,6 @@ endif
 
 map <F12> ggVGg?  " apply rot13 for people snooping over shoulder, good fun
 
-" snipMate Settings
-let g:snips_author = "Buddy Sandidge <buddysandidge@gmail.com>"
-
 " Nerdtree settings
 let NERDTreeDirArrows=1
 
@@ -174,6 +172,10 @@ augroup coffee
     au! BufRead,BufNewFile *.coffee set filetype=coffee
 augroup END
 
+augroup markdown
+    au! BufRead,BufNewFile *.md set filetype=markdown
+augroup END
+
 augroup COMMIT_EDITMSG
     au! BufRead,BufNewFile COMMIT_EDITMSG set filetype=gitcommit
 augroup END