remove pentadactyl, add vimperator folder, move vim undo folder

Also adjust .gitignore for vim and vimperator changes.

.gitignore

@@ -5,8 +5,12 @@
 *.swp
 .netrwhist
 
-# Vim custom snippets directory
+# Vim custom snippets and persistent undo folder
 vim/snippets
+vim/undo
+
+# Vimperator info/history/local settings
+vimperator/info
 
 # Irssi config files
 irssi/config

pentadactyl/pentadactylrc

@@ -1,36 +0,0 @@
-""""""""""""""""""""""""
-" Options
-""""""""""""""""""""""""
-
-" pentadactyl gui options
-set guioptions=rbCBns
-" In order: right/bottom scrollbars, Cmdline outside status, Bookmark bar,
-" Tab number, Statusbar
-
-" set another default search engine. Need to install a search engine through
-" firefox first
-" http://superuser.com/questions/358935/pentadactyl-with-duckduckgo-as-default-search-engine
-" set defsearch=duckduckgo-ssl
-
-
-""""""""""""""""""""""""
-" Mappings
-""""""""""""""""""""""""
-
-map , <leader>
-
-" faster j/k scrolling
-map j 5<C-e>
-map k 5<C-y>
-map J <C-d>
-map K <C-u>
-
-" easier switching of tabs
-map l gt
-map h gT
-
-" screen/tmux-like switch to previous tab
-map <C-a><C-a> <C-^>
-
-" reload pentadactylrc
-map <C-r> :source ~/.pentadactylrc<CR>:echo "Configuration Reloaded (~/.pentadactylrc)"<CR>

setup.sh

@@ -52,14 +52,12 @@ ln -s dotfiles/zsh/zshenv ~/.zshenv
 [ -f ~/.vimrc ] && mv ~/.vimrc "$BACKUP_DIR"
 ln -s dotfiles/vim ~/.vim
 ln -s dotfiles/vim/vimrc ~/.vimrc
-mkdir -p ~/.vimundo # persistent undo directory
-
-# Pentadactyl
-[ -f ~/.pentadactylrc ] && mv ~/.pentadactylrc "$BACKUP_DIR"
-ln -s dotfiles/pentadactyl/pentadactylrc ~/.pentadactylrc
+mkdir -p ~/.vim/undo # persistent undo folder
 
 # Vimperator
+[ -d ~/.vimperator ] && mv ~/.vimperator "$BACKUP_DIR"
 [ -f ~/.vimperatorrc ] && mv ~/.vimperatorrc "$BACKUP_DIR"
+ln -s dotfiles/vimperator ~/.vimperator
 ln -s dotfiles/vimperator/vimperatorrc ~/.vimperatorrc
 
 # Screen

vim/vimrc

@@ -33,7 +33,7 @@ set cursorline    " ensure that there is a cursor line
 " Persistent undo
 if has("persistent_undo")
   set undofile
-  set undodir=~/.vimundo
+  set undodir=~/.vim/undo
 endif
 
 if has("autocmd")