diff --git a/.gitmodules b/.gitmodules
index c392982..5c97627 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,6 @@
 [submodule "vim/bundle/vim-fixkey"]
 	path = vim/bundle/vim-fixkey
 	url = https://github.com/drmikehenry/vim-fixkey.git
+[submodule "vim/bundle/tabular"]
+	path = vim/bundle/tabular
+	url = https://github.com/godlygeek/tabular
diff --git a/README.md b/README.md
index 1ae398c..e4784d7 100644
--- a/README.md
+++ b/README.md
@@ -153,6 +153,7 @@ For a complete list of mappings specific to **darkcloud-vimconfig**, check the l
 * [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWithRegister) Replace text with the contents of a register (for paste+replace without writing over the buffer).
 * [SudoEdit.vim](https://github.com/vim-scripts/SudoEdit.vim) Read and write files without the necessary permissions through the use of sudo.
 * [syntastic](https://github.com/scrooloose/syntastic) Uses system compilers and parsers to check syntax either on-the-fly or after saving a compatible document.
+* [tabular](https://github.com/godlygeek/tabular) Vim script for text filtering and alignment.
 * [tagbar](https://github.com/majutsushi/tagbar) Uses ctags to generate a sidebar of the tags for the current file.
 * [tcommand_vim](https://github.com/tomtom/tcommand_vim) Select commands, menu items etc. from a list
   * [tlib_vim](https://github.com/tomtom/tlib_vim) Some utility functions for VIM
diff --git a/vim/bundle/tabular b/vim/bundle/tabular
new file mode 160000
index 0000000..60f2564
--- /dev/null
+++ b/vim/bundle/tabular
@@ -0,0 +1 @@
+Subproject commit 60f25648814f0695eeb6c1040d97adca93c4e0bb
diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index d3613f1..50fd7f8 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -513,7 +513,7 @@
         vnoremap <silent><expr> <Leader>J '<Esc>:set tw=79<CR>gvgq:set tw=0<CR>:echo "Selected text has been formatted to a width of 79 characters"<CR>'
         nnoremap <Leader>f mzgg=G`z<CR>:echo "The document has been formatted"<CR>
         vnoremap <Leader>f mz=`z<CR>:echo "The selection has been formatted"<CR>
-        nnoremap <Leader>F :Autoformat<CR><CR>:echo "The document has been formatted with :Autoformat"<CR>
+        nnoremap <silent><expr> <Leader>F ':Autoformat<CR>:echo "The document has been formatted with :Autoformat"<CR>'
         nnoremap <silent><expr> <Leader>w ':FixWhitespace<CR>:echo "Trailing whitespace has been removed"<CR>'
         nnoremap <silent><expr> <Leader>t ':retab<CR>:noh<CR>:echo "Tabs have been converted to spaces"<CR>'
 
@@ -658,6 +658,7 @@
     "markdown: launch table of contents instead of the tagbar
     autocmd FileType mkd map <buffer> <silent><expr> <C-F3> ':Toch<CR>'
     autocmd FileType mkd map <buffer> <silent><expr> <A-F3> ':Toch<CR>'
+    autocmd Filetype mkd nnoremap <buffer> <silent><expr> <Leader>F ':TableFormat<CR>:echo "Markdown tables have been formatted with :FormatTable"<CR>'
 
     "markdown table of contents
     autocmd FileType qf map <buffer> <LeftMouse> <LeftMouse>0