diff --git a/bash/.bash_profile b/.bash_profile
similarity index 100%
rename from bash/.bash_profile
rename to .bash_profile
diff --git a/bash/.bashrc b/.bashrc
similarity index 100%
rename from bash/.bashrc
rename to .bashrc
diff --git a/ruby/.gemrc b/.gemrc
similarity index 100%
rename from ruby/.gemrc
rename to .gemrc
diff --git a/git/.git_templates/hooks/ctags b/.git_templates/hooks/ctags
similarity index 100%
rename from git/.git_templates/hooks/ctags
rename to .git_templates/hooks/ctags
diff --git a/git/.git_templates/hooks/post-checkout b/.git_templates/hooks/post-checkout
similarity index 100%
rename from git/.git_templates/hooks/post-checkout
rename to .git_templates/hooks/post-checkout
diff --git a/git/.git_templates/hooks/post-commit b/.git_templates/hooks/post-commit
similarity index 100%
rename from git/.git_templates/hooks/post-commit
rename to .git_templates/hooks/post-commit
diff --git a/git/.git_templates/hooks/post-merge b/.git_templates/hooks/post-merge
similarity index 100%
rename from git/.git_templates/hooks/post-merge
rename to .git_templates/hooks/post-merge
diff --git a/git/.git_templates/hooks/post-rewrite b/.git_templates/hooks/post-rewrite
similarity index 100%
rename from git/.git_templates/hooks/post-rewrite
rename to .git_templates/hooks/post-rewrite
diff --git a/git/.gitconfig b/.gitconfig
similarity index 100%
rename from git/.gitconfig
rename to .gitconfig
diff --git a/.gitignore b/.gitignore
index 1a797d3..31c8b6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 *.private
 
 Alfred\ 2/Alfred.alfredpreferences/preferences/local
-config/.config
-pentadactyl/.pentadactyl/info
-ssh/.ssh/*_rsa
-ssh/.ssh/known_hosts
-vim/.vim/.netrwhist
-vim/.vim/.scratch
-vim/.vim/.VimballRecord
+.config
+.pentadactyl/info
+.ssh/*_rsa
+.ssh/known_hosts
+.vim/.netrwhist
+.vim/.scratch
+.vim/.VimballRecord
diff --git a/.gitmodules b/.gitmodules
index f84703f..d6dd2ee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,80 +1,80 @@
 [submodule ".vim/bundle/vim-pandoc"]
-	path = vim/.vim/bundle/vim-pandoc
+	path = .vim/bundle/vim-pandoc
 	url = git://github.com/vim-pandoc/vim-pandoc.git
 [submodule ".vim/bundle/vim-textobj-user"]
-	path = vim/.vim/bundle/vim-textobj-user
+	path = .vim/bundle/vim-textobj-user
 	url = git://github.com/kana/vim-textobj-user.git
 [submodule ".vim/bundle/vim-textobj-line"]
-	path = vim/.vim/bundle/vim-textobj-line
+	path = .vim/bundle/vim-textobj-line
 	url = git://github.com/kana/vim-textobj-line.git
 [submodule ".vim/bundle/argtextobj.vim"]
-	path = vim/.vim/bundle/argtextobj.vim
+	path = .vim/bundle/argtextobj.vim
 	url = git://github.com/vim-scripts/argtextobj.vim.git
 [submodule ".vim/bundle/gist-vim"]
-	path = vim/.vim/bundle/gist-vim
+	path = .vim/bundle/gist-vim
 	url = git://github.com/mattn/gist-vim.git
 [submodule ".vim/bundle/vim-textobj-rubyblock"]
-	path = vim/.vim/bundle/vim-textobj-rubyblock
+	path = .vim/bundle/vim-textobj-rubyblock
 	url = git://github.com/nelstrom/vim-textobj-rubyblock.git
 [submodule ".vim/bundle/vim-indent-object"]
-	path = vim/.vim/bundle/vim-indent-object
+	path = .vim/bundle/vim-indent-object
 	url = git://github.com/michaeljsmith/vim-indent-object.git
 [submodule ".vim/bundle/vim-colors-solarized"]
-	path = vim/.vim/bundle/vim-colors-solarized
+	path = .vim/bundle/vim-colors-solarized
 	url = git://github.com/altercation/vim-colors-solarized.git
 [submodule ".vim/bundle/vim-repeat"]
-	path = vim/.vim/bundle/vim-repeat
+	path = .vim/bundle/vim-repeat
 	url = git://github.com/tpope/vim-repeat.git
 [submodule ".vim/bundle/vim-surround"]
-	path = vim/.vim/bundle/vim-surround
+	path = .vim/bundle/vim-surround
 	url = git://github.com/tpope/vim-surround.git
 [submodule ".vim/bundle/tabular"]
-	path = vim/.vim/bundle/tabular
+	path = .vim/bundle/tabular
 	url = git://github.com/godlygeek/tabular.git
 [submodule ".vim/bundle/vim-ruby"]
-	path = vim/.vim/bundle/vim-ruby
+	path = .vim/bundle/vim-ruby
 	url = git://github.com/vim-ruby/vim-ruby.git
 [submodule ".vim/bundle/vim-fugitive"]
-	path = vim/.vim/bundle/vim-fugitive
+	path = .vim/bundle/vim-fugitive
 	url = git://github.com/tpope/vim-fugitive.git
 [submodule ".vim/bundle/vim-coffee-script"]
-	path = vim/.vim/bundle/vim-coffee-script
+	path = .vim/bundle/vim-coffee-script
 	url = git://github.com/kchmck/vim-coffee-script.git
 [submodule ".vim/bundle/vim-haml"]
-	path = vim/.vim/bundle/vim-haml
+	path = .vim/bundle/vim-haml
 	url = git://github.com/tpope/vim-haml.git
 [submodule ".vim/bundle/gundo"]
-	path = vim/.vim/bundle/gundo
+	path = .vim/bundle/gundo
 	url = git://github.com/sjl/gundo.vim.git
 [submodule ".vim/bundle/vim-dispatch"]
-	path = vim/.vim/bundle/vim-dispatch
+	path = .vim/bundle/vim-dispatch
 	url = git://github.com/tpope/vim-dispatch.git
 [submodule ".vim/bundle/tagbar"]
-	path = vim/.vim/bundle/tagbar
+	path = .vim/bundle/tagbar
 	url = git://github.com/majutsushi/tagbar.git
 [submodule ".vim/bundle/ctrlp"]
-	path = vim/.vim/bundle/ctrlp
+	path = .vim/bundle/ctrlp
 	url = git://github.com/kien/ctrlp.vim.git
 [submodule ".vim/bundle/base16"]
-	path = vim/.vim/bundle/base16
+	path = .vim/bundle/base16
 	url = git://github.com/chriskempson/base16-vim.git
-[submodule "vim/.vim/bundle/fakeclip"]
-	path = vim/.vim/bundle/fakeclip
+[submodule ".vim/bundle/fakeclip"]
+	path = .vim/bundle/fakeclip
 	url = https://github.com/kana/vim-fakeclip
-[submodule "vim/.vim/bundle/ag"]
-	path = vim/.vim/bundle/ag
+[submodule ".vim/bundle/ag"]
+	path = .vim/bundle/ag
 	url = git://github.com/rking/ag.vim.git
-[submodule "vim/.vim/bundle/vinegar"]
-	path = vim/.vim/bundle/vinegar
+[submodule ".vim/bundle/vinegar"]
+	path = .vim/bundle/vinegar
 	url = git://github.com/tpope/vim-vinegar.git
-[submodule "vim/.vim/bundle/go"]
-	path = vim/.vim/bundle/go
+[submodule ".vim/bundle/go"]
+	path = .vim/bundle/go
 	url = https://github.com/fatih/vim-go.git
-[submodule "vim/.vim/bundle/vim-tmux-navigator"]
-	path = vim/.vim/bundle/vim-tmux-navigator
+[submodule ".vim/bundle/vim-tmux-navigator"]
+	path = .vim/bundle/vim-tmux-navigator
 	url = git://github.com/christoomey/vim-tmux-navigator.git
-[submodule "vim/.vim/bundle/vim-pandoc-syntax"]
-	path = vim/.vim/bundle/vim-pandoc-syntax
+[submodule ".vim/bundle/vim-pandoc-syntax"]
+	path = .vim/bundle/vim-pandoc-syntax
 	url = git://github.com/vim-pandoc/vim-pandoc-syntax.git
 [submodule "src/powerline"]
 	path = src/powerline
@@ -82,33 +82,33 @@
 [submodule "src/prezto"]
 	path = src/prezto
 	url = git://github.com/kejadlen/prezto.git
-[submodule "vim/.vim/bundle/vim-endwise"]
-	path = vim/.vim/bundle/vim-endwise
+[submodule ".vim/bundle/vim-endwise"]
+	path = .vim/bundle/vim-endwise
 	url = git://github.com/tpope/vim-endwise.git
-[submodule "vim/.vim/bundle/vim-sleuth"]
-	path = vim/.vim/bundle/vim-sleuth
+[submodule ".vim/bundle/vim-sleuth"]
+	path = .vim/bundle/vim-sleuth
 	url = git://github.com/tpope/vim-sleuth.git
-[submodule "vim/.vim/bundle/vim-startify"]
-	path = vim/.vim/bundle/vim-startify
+[submodule ".vim/bundle/vim-startify"]
+	path = .vim/bundle/vim-startify
 	url = https://github.com/mhinz/vim-startify.git
-[submodule "vim/.vim/bundle/vim-rsi"]
-	path = vim/.vim/bundle/vim-rsi
+[submodule ".vim/bundle/vim-rsi"]
+	path = .vim/bundle/vim-rsi
 	url = https://github.com/tpope/vim-rsi.git
-[submodule "vim/.vim/bundle/vim-sensible"]
-	path = vim/.vim/bundle/vim-sensible
+[submodule ".vim/bundle/vim-sensible"]
+	path = .vim/bundle/vim-sensible
 	url = https://github.com/tpope/vim-sensible.git
-[submodule "vim/.vim/bundle/vim-unimpaired"]
-	path = vim/.vim/bundle/vim-unimpaired
+[submodule ".vim/bundle/vim-unimpaired"]
+	path = .vim/bundle/vim-unimpaired
 	url = https://github.com/tpope/vim-unimpaired.git
-[submodule "vim/.vim/bundle/rust.vim"]
-	path = vim/.vim/bundle/rust.vim
+[submodule ".vim/bundle/rust.vim"]
+	path = .vim/bundle/rust.vim
 	url = https://github.com/wting/rust.vim.git
-[submodule "vim/.vim/bundle/incsearch.vim"]
-	path = vim/.vim/bundle/incsearch.vim
+[submodule ".vim/bundle/incsearch.vim"]
+	path = .vim/bundle/incsearch.vim
 	url = https://github.com/haya14busa/incsearch.vim
 [submodule "Alfred 2/Alfred.alfredpreferences/workflows/user.workflow.8694C3FC-8218-4B98-BB1F-F1CEC686477C"]
 	path = Alfred 2/Alfred.alfredpreferences/workflows/user.workflow.8694C3FC-8218-4B98-BB1F-F1CEC686477C
 	url = https://github.com/kejadlen/forecast.alfredworkflow.git
-[submodule "vim/.vim/bundle/nerdcommenter"]
-	path = vim/.vim/bundle/nerdcommenter
+[submodule ".vim/bundle/nerdcommenter"]
+	path = .vim/bundle/nerdcommenter
 	url = https://github.com/scrooloose/nerdcommenter.git
diff --git a/readline/.inputrc b/.inputrc
similarity index 100%
rename from readline/.inputrc
rename to .inputrc
diff --git a/ruby/.irbrc b/.irbrc
similarity index 100%
rename from ruby/.irbrc
rename to .irbrc
diff --git a/pentadactyl/.pentadactyl/plugin/jquery-dev.js b/.pentadactyl/plugin/jquery-dev.js
similarity index 100%
rename from pentadactyl/.pentadactyl/plugin/jquery-dev.js
rename to .pentadactyl/plugin/jquery-dev.js
diff --git a/pentadactyl/.pentadactylrc b/.pentadactylrc
similarity index 100%
rename from pentadactyl/.pentadactylrc
rename to .pentadactylrc
diff --git a/ruby/.pryrc b/.pryrc
similarity index 100%
rename from ruby/.pryrc
rename to .pryrc
diff --git a/ssh/.ssh/authorized_keys b/.ssh/authorized_keys
similarity index 100%
rename from ssh/.ssh/authorized_keys
rename to .ssh/authorized_keys
diff --git a/ssh/.ssh/config b/.ssh/config
similarity index 83%
rename from ssh/.ssh/config
rename to .ssh/config
index a96e1f6..d2a6fa5 100644
--- a/ssh/.ssh/config
+++ b/.ssh/config
@@ -16,12 +16,6 @@ Host *
 #   User root
 #   LogLevel ERROR
 
-Host *.intsm.net
-  IdentityFile ~/.ssh/sm_rsa
-  ForwardAgent yes
-  StrictHostKeyChecking no
-  # UserKnownHostsFile=/dev/null
-
 Host *.github.com
   IdentityFile ~/.ssh/github_rsa
 
diff --git a/ssh/.ssh/github_rsa.pub b/.ssh/github_rsa.pub
similarity index 100%
rename from ssh/.ssh/github_rsa.pub
rename to .ssh/github_rsa.pub
diff --git a/ssh/.ssh/id_rsa.pub b/.ssh/id_rsa.pub
similarity index 100%
rename from ssh/.ssh/id_rsa.pub
rename to .ssh/id_rsa.pub
diff --git a/ssh/.ssh/prgmr_rsa.pub b/.ssh/prgmr_rsa.pub
similarity index 100%
rename from ssh/.ssh/prgmr_rsa.pub
rename to .ssh/prgmr_rsa.pub
diff --git a/tmux/.tmux.conf b/.tmux.conf
similarity index 100%
rename from tmux/.tmux.conf
rename to .tmux.conf
diff --git a/vim/.vim/after/ftplugin/cpp.vim b/.vim/after/ftplugin/cpp.vim
similarity index 100%
rename from vim/.vim/after/ftplugin/cpp.vim
rename to .vim/after/ftplugin/cpp.vim
diff --git a/vim/.vim/after/ftplugin/gitconfig.vim b/.vim/after/ftplugin/gitconfig.vim
similarity index 100%
rename from vim/.vim/after/ftplugin/gitconfig.vim
rename to .vim/after/ftplugin/gitconfig.vim
diff --git a/vim/.vim/after/ftplugin/go.vim b/.vim/after/ftplugin/go.vim
similarity index 100%
rename from vim/.vim/after/ftplugin/go.vim
rename to .vim/after/ftplugin/go.vim
diff --git a/vim/.vim/after/ftplugin/objc.vim b/.vim/after/ftplugin/objc.vim
similarity index 100%
rename from vim/.vim/after/ftplugin/objc.vim
rename to .vim/after/ftplugin/objc.vim
diff --git a/vim/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim
similarity index 100%
rename from vim/.vim/after/ftplugin/python.vim
rename to .vim/after/ftplugin/python.vim
diff --git a/vim/.vim/after/ftplugin/ruby.vim b/.vim/after/ftplugin/ruby.vim
similarity index 100%
rename from vim/.vim/after/ftplugin/ruby.vim
rename to .vim/after/ftplugin/ruby.vim
diff --git a/vim/.vim/after/ftplugin/taskpaper.vim b/.vim/after/ftplugin/taskpaper.vim
similarity index 100%
rename from vim/.vim/after/ftplugin/taskpaper.vim
rename to .vim/after/ftplugin/taskpaper.vim
diff --git a/vim/.vim/after/ftplugin/vimwiki.vim b/.vim/after/ftplugin/vimwiki.vim
similarity index 100%
rename from vim/.vim/after/ftplugin/vimwiki.vim
rename to .vim/after/ftplugin/vimwiki.vim
diff --git a/vim/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim
similarity index 100%
rename from vim/.vim/autoload/pathogen.vim
rename to .vim/autoload/pathogen.vim
diff --git a/vim/.vim/bundle/ag b/.vim/bundle/ag
similarity index 100%
rename from vim/.vim/bundle/ag
rename to .vim/bundle/ag
diff --git a/vim/.vim/bundle/argtextobj.vim b/.vim/bundle/argtextobj.vim
similarity index 100%
rename from vim/.vim/bundle/argtextobj.vim
rename to .vim/bundle/argtextobj.vim
diff --git a/vim/.vim/bundle/base16 b/.vim/bundle/base16
similarity index 100%
rename from vim/.vim/bundle/base16
rename to .vim/bundle/base16
diff --git a/vim/.vim/bundle/camelcasemotion/.VimballRecord b/.vim/bundle/camelcasemotion/.VimballRecord
similarity index 100%
rename from vim/.vim/bundle/camelcasemotion/.VimballRecord
rename to .vim/bundle/camelcasemotion/.VimballRecord
diff --git a/vim/.vim/bundle/camelcasemotion/autoload/camelcasemotion.vim b/.vim/bundle/camelcasemotion/autoload/camelcasemotion.vim
similarity index 100%
rename from vim/.vim/bundle/camelcasemotion/autoload/camelcasemotion.vim
rename to .vim/bundle/camelcasemotion/autoload/camelcasemotion.vim
diff --git a/vim/.vim/bundle/camelcasemotion/doc/camelcasemotion.txt b/.vim/bundle/camelcasemotion/doc/camelcasemotion.txt
similarity index 100%
rename from vim/.vim/bundle/camelcasemotion/doc/camelcasemotion.txt
rename to .vim/bundle/camelcasemotion/doc/camelcasemotion.txt
diff --git a/vim/.vim/bundle/camelcasemotion/doc/tags b/.vim/bundle/camelcasemotion/doc/tags
similarity index 100%
rename from vim/.vim/bundle/camelcasemotion/doc/tags
rename to .vim/bundle/camelcasemotion/doc/tags
diff --git a/vim/.vim/bundle/camelcasemotion/plugin/camelcasemotion.vim b/.vim/bundle/camelcasemotion/plugin/camelcasemotion.vim
similarity index 100%
rename from vim/.vim/bundle/camelcasemotion/plugin/camelcasemotion.vim
rename to .vim/bundle/camelcasemotion/plugin/camelcasemotion.vim
diff --git a/vim/.vim/bundle/ctrlp b/.vim/bundle/ctrlp
similarity index 100%
rename from vim/.vim/bundle/ctrlp
rename to .vim/bundle/ctrlp
diff --git a/vim/.vim/bundle/fakeclip b/.vim/bundle/fakeclip
similarity index 100%
rename from vim/.vim/bundle/fakeclip
rename to .vim/bundle/fakeclip
diff --git a/vim/.vim/bundle/gist-vim b/.vim/bundle/gist-vim
similarity index 100%
rename from vim/.vim/bundle/gist-vim
rename to .vim/bundle/gist-vim
diff --git a/vim/.vim/bundle/go b/.vim/bundle/go
similarity index 100%
rename from vim/.vim/bundle/go
rename to .vim/bundle/go
diff --git a/vim/.vim/bundle/gundo b/.vim/bundle/gundo
similarity index 100%
rename from vim/.vim/bundle/gundo
rename to .vim/bundle/gundo
diff --git a/vim/.vim/bundle/incsearch.vim b/.vim/bundle/incsearch.vim
similarity index 100%
rename from vim/.vim/bundle/incsearch.vim
rename to .vim/bundle/incsearch.vim
diff --git a/vim/.vim/bundle/nerdcommenter b/.vim/bundle/nerdcommenter
similarity index 100%
rename from vim/.vim/bundle/nerdcommenter
rename to .vim/bundle/nerdcommenter
diff --git a/vim/.vim/bundle/powerline/__init__.py b/.vim/bundle/powerline/__init__.py
similarity index 100%
rename from vim/.vim/bundle/powerline/__init__.py
rename to .vim/bundle/powerline/__init__.py
diff --git a/vim/.vim/bundle/powerline/__init__.pyc b/.vim/bundle/powerline/__init__.pyc
similarity index 100%
rename from vim/.vim/bundle/powerline/__init__.pyc
rename to .vim/bundle/powerline/__init__.pyc
diff --git a/vim/.vim/bundle/powerline/plugin/powerline.vim b/.vim/bundle/powerline/plugin/powerline.vim
similarity index 100%
rename from vim/.vim/bundle/powerline/plugin/powerline.vim
rename to .vim/bundle/powerline/plugin/powerline.vim
diff --git a/vim/.vim/bundle/rust.vim b/.vim/bundle/rust.vim
similarity index 100%
rename from vim/.vim/bundle/rust.vim
rename to .vim/bundle/rust.vim
diff --git a/vim/.vim/bundle/tabular b/.vim/bundle/tabular
similarity index 100%
rename from vim/.vim/bundle/tabular
rename to .vim/bundle/tabular
diff --git a/vim/.vim/bundle/tagbar b/.vim/bundle/tagbar
similarity index 100%
rename from vim/.vim/bundle/tagbar
rename to .vim/bundle/tagbar
diff --git a/vim/.vim/bundle/vim-coffee-script b/.vim/bundle/vim-coffee-script
similarity index 100%
rename from vim/.vim/bundle/vim-coffee-script
rename to .vim/bundle/vim-coffee-script
diff --git a/vim/.vim/bundle/vim-colors-solarized b/.vim/bundle/vim-colors-solarized
similarity index 100%
rename from vim/.vim/bundle/vim-colors-solarized
rename to .vim/bundle/vim-colors-solarized
diff --git a/vim/.vim/bundle/vim-dispatch b/.vim/bundle/vim-dispatch
similarity index 100%
rename from vim/.vim/bundle/vim-dispatch
rename to .vim/bundle/vim-dispatch
diff --git a/vim/.vim/bundle/vim-endwise b/.vim/bundle/vim-endwise
similarity index 100%
rename from vim/.vim/bundle/vim-endwise
rename to .vim/bundle/vim-endwise
diff --git a/vim/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
similarity index 100%
rename from vim/.vim/bundle/vim-fugitive
rename to .vim/bundle/vim-fugitive
diff --git a/vim/.vim/bundle/vim-haml b/.vim/bundle/vim-haml
similarity index 100%
rename from vim/.vim/bundle/vim-haml
rename to .vim/bundle/vim-haml
diff --git a/vim/.vim/bundle/vim-indent-object b/.vim/bundle/vim-indent-object
similarity index 100%
rename from vim/.vim/bundle/vim-indent-object
rename to .vim/bundle/vim-indent-object
diff --git a/vim/.vim/bundle/vim-pandoc b/.vim/bundle/vim-pandoc
similarity index 100%
rename from vim/.vim/bundle/vim-pandoc
rename to .vim/bundle/vim-pandoc
diff --git a/vim/.vim/bundle/vim-pandoc-syntax b/.vim/bundle/vim-pandoc-syntax
similarity index 100%
rename from vim/.vim/bundle/vim-pandoc-syntax
rename to .vim/bundle/vim-pandoc-syntax
diff --git a/vim/.vim/bundle/vim-repeat b/.vim/bundle/vim-repeat
similarity index 100%
rename from vim/.vim/bundle/vim-repeat
rename to .vim/bundle/vim-repeat
diff --git a/vim/.vim/bundle/vim-rsi b/.vim/bundle/vim-rsi
similarity index 100%
rename from vim/.vim/bundle/vim-rsi
rename to .vim/bundle/vim-rsi
diff --git a/vim/.vim/bundle/vim-ruby b/.vim/bundle/vim-ruby
similarity index 100%
rename from vim/.vim/bundle/vim-ruby
rename to .vim/bundle/vim-ruby
diff --git a/vim/.vim/bundle/vim-sensible b/.vim/bundle/vim-sensible
similarity index 100%
rename from vim/.vim/bundle/vim-sensible
rename to .vim/bundle/vim-sensible
diff --git a/vim/.vim/bundle/vim-sleuth b/.vim/bundle/vim-sleuth
similarity index 100%
rename from vim/.vim/bundle/vim-sleuth
rename to .vim/bundle/vim-sleuth
diff --git a/vim/.vim/bundle/vim-startify b/.vim/bundle/vim-startify
similarity index 100%
rename from vim/.vim/bundle/vim-startify
rename to .vim/bundle/vim-startify
diff --git a/vim/.vim/bundle/vim-surround b/.vim/bundle/vim-surround
similarity index 100%
rename from vim/.vim/bundle/vim-surround
rename to .vim/bundle/vim-surround
diff --git a/vim/.vim/bundle/vim-textobj-line b/.vim/bundle/vim-textobj-line
similarity index 100%
rename from vim/.vim/bundle/vim-textobj-line
rename to .vim/bundle/vim-textobj-line
diff --git a/vim/.vim/bundle/vim-textobj-rubyblock b/.vim/bundle/vim-textobj-rubyblock
similarity index 100%
rename from vim/.vim/bundle/vim-textobj-rubyblock
rename to .vim/bundle/vim-textobj-rubyblock
diff --git a/vim/.vim/bundle/vim-textobj-user b/.vim/bundle/vim-textobj-user
similarity index 100%
rename from vim/.vim/bundle/vim-textobj-user
rename to .vim/bundle/vim-textobj-user
diff --git a/vim/.vim/bundle/vim-tmux-navigator b/.vim/bundle/vim-tmux-navigator
similarity index 100%
rename from vim/.vim/bundle/vim-tmux-navigator
rename to .vim/bundle/vim-tmux-navigator
diff --git a/vim/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired
similarity index 100%
rename from vim/.vim/bundle/vim-unimpaired
rename to .vim/bundle/vim-unimpaired
diff --git a/vim/.vim/bundle/vinegar b/.vim/bundle/vinegar
similarity index 100%
rename from vim/.vim/bundle/vinegar
rename to .vim/bundle/vinegar
diff --git a/vim/.vim/colors/desert256.vim b/.vim/colors/desert256.vim
similarity index 100%
rename from vim/.vim/colors/desert256.vim
rename to .vim/colors/desert256.vim
diff --git a/vim/.vim/ftdetect/applescript.vim b/.vim/ftdetect/applescript.vim
similarity index 100%
rename from vim/.vim/ftdetect/applescript.vim
rename to .vim/ftdetect/applescript.vim
diff --git a/vim/.vim/ftdetect/ragel.vim b/.vim/ftdetect/ragel.vim
similarity index 100%
rename from vim/.vim/ftdetect/ragel.vim
rename to .vim/ftdetect/ragel.vim
diff --git a/vim/.vim/indent/python.vim b/.vim/indent/python.vim
similarity index 100%
rename from vim/.vim/indent/python.vim
rename to .vim/indent/python.vim
diff --git a/vim/.vim/syntax/applescript.vim b/.vim/syntax/applescript.vim
similarity index 100%
rename from vim/.vim/syntax/applescript.vim
rename to .vim/syntax/applescript.vim
diff --git a/vim/.vim/syntax/ragel.vim b/.vim/syntax/ragel.vim
similarity index 100%
rename from vim/.vim/syntax/ragel.vim
rename to .vim/syntax/ragel.vim
diff --git a/vim/.vim/syntax/textile.vim b/.vim/syntax/textile.vim
similarity index 100%
rename from vim/.vim/syntax/textile.vim
rename to .vim/syntax/textile.vim
diff --git a/vim/.vimrc b/.vimrc
similarity index 100%
rename from vim/.vimrc
rename to .vimrc
diff --git a/ansible/main.yml b/ansible/main.yml
index 5ffaba4..461d376 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -2,4 +2,4 @@
   roles:
     - bootstrap
     - { role: osx, when: ansible_distribution == "MacOSX" }
-    # - dotfiles
+    - dotfiles
diff --git a/ansible/roles/dotfiles/tasks/dotfiles.yml b/ansible/roles/dotfiles/tasks/dotfiles.yml
index e941199..f463eb9 100644
--- a/ansible/roles/dotfiles/tasks/dotfiles.yml
+++ b/ansible/roles/dotfiles/tasks/dotfiles.yml
@@ -1,19 +1,9 @@
 ---
-- homebrew: name=stow state=present
-  when: ansible_distribution == "MacOSX"
-- apt: pkg={{ item }} state=present
+- file: path={{ item }} state=directory # TODO Do this automatically
   with_items:
-    - git
-    - stow
-  sudo: True
-  when: ansible_os_family == "Debian"
-- command: >
-    chdir={{ ansible_env.HOME }}/.dotfiles
-    stow --stow --target={{ ansible_env.HOME }} {{ item }}
-  with_items: stow
-  tags: stow
-- file:
-    src: ~/.dotfiles/{{ item.key }}
-    dest: "{{ item.value }}"
-    state: link
-  with_dict: ln
+    - ~/.bundle
+    - ~/.ssh
+- file: src=~/.dotfiles/{{ item.key }} dest={{ item.value }} state=link
+  with_dict: dotfiles
+- file: src=~/.dotfiles/.ssh/{{ item }} dest=~/.ssh/{{ item }} state=link
+  with_lines: ls ~/.dotfiles/.ssh
diff --git a/ansible/roles/dotfiles/vars/main.yml b/ansible/roles/dotfiles/vars/main.yml
index d199c6a..6dcb4eb 100644
--- a/ansible/roles/dotfiles/vars/main.yml
+++ b/ansible/roles/dotfiles/vars/main.yml
@@ -1,10 +1,15 @@
-stow:
-  - config
-  - git
-  - pentadactyl
-  - ruby
-  - tmux
-  - vim
-ln:
+dotfiles:
   gitignore: ~/.gitignore
+  .bundle/config: ~/.bundle/config
+  .config: ~/.config
+  .gemrc: ~/.gemrc
+  .git_templates: ~/.git_templates
+  .gitconfig.private: ~/.gitconfig.private
+  .gitconfig: ~/.gitconfig
   .hammerspoon: ~/.hammerspoon
+  # .pentadactyl: ~/.pentadactyl
+  .pentadactylrc: ~/.pentadactylrc
+  .pryrc: ~/.pryrc
+  .tmux.conf: ~/.tmux.conf
+  .vim: ~/.vim
+  .vimrc: ~/.vimrc
diff --git a/config/.config/powerline/colorschemes/tmux/default.json b/config/.config/powerline/colorschemes/tmux/default.json
deleted file mode 100644
index 0633ad0..0000000
--- a/config/.config/powerline/colorschemes/tmux/default.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"groups": {
-		"background":           {"bg": "gray1"},
-		"active_window_status": {"bg": "gray1"},
-		"window_status":        {"bg": "gray1"},
-		"activity_status":      {"bg": "gray1"},
-		"bell_status":          {"bg": "gray1"},
-		"window":               {"bg": "gray1"},
-		"window:divider":       {"bg": "gray1"}
-	}
-}
diff --git a/config/.config/powerline/themes/tmux/default.json b/config/.config/powerline/themes/tmux/default.json
deleted file mode 100644
index bb1bccb..0000000
--- a/config/.config/powerline/themes/tmux/default.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"segments": {
-		"right": []
-	}
-}
diff --git a/ruby/.bundle/config b/ruby/.bundle/config
deleted file mode 100644
index b2b4125..0000000
--- a/ruby/.bundle/config
+++ /dev/null
@@ -1,3 +0,0 @@
----
-BUNDLE_PATH: ".bundle"
-BUNDLE_JOBS: '4'
diff --git a/vim/.vim/bundle/scratch/plugin/scratch.vim b/vim/.vim/bundle/scratch/plugin/scratch.vim
deleted file mode 100644
index 9b83ea4..0000000
--- a/vim/.vim/bundle/scratch/plugin/scratch.vim
+++ /dev/null
@@ -1,134 +0,0 @@
-" scratch.vim
-" Author: Abhilash Koneri (abhilash_koneri at hotmail dot com)
-" Improved By: Hari Krishna Dara (hari_vim at yahoo dot com)
-" Last Change: 25-Feb-2004 @ 09:48
-" Created: 17-Aug-2002
-" Version: 1.0.0
-" Download From:
-"     http://www.vim.org/script.php?script_id=389
-"----------------------------------------------------------------------
-" This is a simple plugin that creates a scratch buffer for your
-" vim session and helps to access it when you need it.  
-"
-" If you like the custom mappings provided in the script - hitting
-" <F8> should create a new scratch buffer. You can do your scribes
-" here and if you want to get rid of it, hit <F8> again inside scratch buffer
-" window. If you want to get back to the scratch buffer repeat <F8>. Use
-" <Plug>ShowScratchBuffer and <Plug>InsShowScratchBuffer to customize these
-" mappings.
-"
-" If you want to designate a file into which the scratch buffer contents
-" should automatically be dumped to, when Vim exits, set its path to
-" g:scratchBackupFile global variable. This file can be accessed just in case
-" you happen to have some important information in the scratch buffer and quit
-" Vim (or shutdown the m/c) forgetting to copy it over. The target file is
-" force overwritten using the :write! command so make sure you set a file name
-" that can accidentally be used for other purposes (especially when you use
-" relative paths). I recommend a value of '/tmp/scratch.txt'.
-" CAUTION: This feature works only when Vim generates VimLeavePre autocommad.
-"
-" Custom mappings
-" ---------------
-" The ones defined below are not very ergonomic!
-"----------------------------------------------------------------------
-"Standard Inteface:  <F8> to make a new ScratchBuffer, <F8>-again to hide one
-
-if exists('loaded_scratch')
-  finish
-endif
-let loaded_scratch = 1
-
-" Make sure line-continuations won't cause any problem. This will be restored
-"   at the end
-let s:save_cpo = &cpo
-set cpo&vim
-
-if (! exists("no_plugin_maps") || ! no_plugin_maps) &&
-      \ (! exists("no_scratch_maps") || ! no_scratch_maps)
-  if !hasmapto('<Plug>ShowScratchBuffer',"n")
-    nmap <unique> <silent> <F8> <Plug>ShowScratchBuffer
-  endif
-  if !hasmapto('<Plug>InsShowScratchBuffer',"i")
-    imap <unique> <silent> <F8> <Plug>InsShowScratchBuffer
-  endif
-endif
-
-" User Overrideable Plugin Interface
-nmap <script> <silent> <Plug>ShowScratchBuffer
-      \ :silent call <SID>ShowScratchBuffer()<cr>
-imap <script> <silent> <Plug>InsShowScratchBuffer
-      \ <c-o>:silent call <SID>ShowScratchBuffer()<cr>
-
-command! -nargs=0 Scratch :call <SID>ShowScratchBuffer()
-
-if !exists('g:scratchBackupFile')
-  let g:scratchBackupFile = '' " So that users can easily find this var.
-endif
-aug ScratchBackup
-  au!
-  au VimLeavePre * :call <SID>BackupScratchBuffer()
-aug END
-
-let s:SCRATCH_BUFFER_NAME="[Scratch]"
-if !exists('s:buffer_number') " Supports reloading.
-  let s:buffer_number = -1
-endif
-
-"----------------------------------------------------------------------
-" Diplays the scratch buffer. Creates one if it is an already 
-" present
-"----------------------------------------------------------------------
-function! <SID>ShowScratchBuffer()
-  if(s:buffer_number == -1 || bufexists(s:buffer_number) == 0)
-    " Temporarily modify isfname to avoid treating the name as a pattern.
-    let _isf = &isfname
-    set isfname-=\
-    set isfname-=[
-    if exists('+shellslash')
-      exec "sp \\\\". s:SCRATCH_BUFFER_NAME
-    else
-      exec "sp \\". s:SCRATCH_BUFFER_NAME
-    endif
-    let &isfname = _isf
-    let s:buffer_number = bufnr('%')
-  else
-    let buffer_win=bufwinnr(s:buffer_number)
-    if(buffer_win == -1)
-      exec 'sb '. s:buffer_number
-    else
-      exec buffer_win.'wincmd w'
-    endif
-  endif
-  " Do setup always, just in case.
-  setlocal buftype=nofile
-  setlocal bufhidden=hide
-  setlocal nobuflisted
-  setlocal noswapfile
-  setlocal noro
-  nmap <buffer> <silent> <Plug>ShowScratchBuffer :hide<cr>
-  imap <buffer> <silent> <Plug>InsShowScratchBuffer <c-o>:hide<cr>
-  command! -buffer -nargs=0 Scratch :hide
-endfunction
-
-function! s:BackupScratchBuffer()
-  if s:buffer_number != -1 && exists('g:scratchBackupFile') &&
-        \ g:scratchBackupFile != ''
-    exec 'split #' . s:buffer_number
-    " Avoid writing empty scratch buffers.
-    if line('$') > 1 || getline(1) !~ '^\s*$'
-      let _cpo=&cpo
-      try
-        set cpo-=A
-        exec 'write!' g:scratchBackupFile
-      finally
-        let &cpo=_cpo
-      endtry
-    endif
-  endif
-endfunction
-
-" Restore cpo.
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim6: sw=2 et