vim: nerdtree, autocomplete, snipmate, fuzzyfinder, pathogen

modified:   .gitignore
new file:   .vim/.gitignore
new file:   .vim/bundle/fuzzyfinder
new file:   .vim/bundle/l9
new file:   .vim/bundle/nerdtree
new file:   .vim/bundle/phpcomplete.vim
new file:   .vim/bundle/tlib_vim
new file:   .vim/bundle/vim-addon-mw-utils
new file:   .vim/bundle/vim-pathogen
new file:   .vim/bundle/vim-snipmate
new file:   .vim/bundle/vim-snippets
new file:   .vim/debugger.py
new file:   .vim/debugger.vim
new file:   .vim/snippets/php.snippets
new file:   .vimrc
deleted:    README.md
Merge branch 'master' into vim
vim: added submodules

new file:   .gitmodules
fluxbox: generic style

new file:   .fluxbox/styles/Generic/theme.cfg
modified:   .gitignore
vim: vim-unimpaired

Added new submodule with 20 handy key maps.
Merge branch 'master' into vim

Conflicts:
	.gitignore
Merge branch 'master' into fluxbox

Conflicts:
	.gitignore
ctags: submodule, install script, alias
Merge branch 'master' into vim
Merge branch 'master' into fluxbox
Merge branch 'master' into ctags
ctags: moved install script into .configitor dir

renamed:    share/ctags/install.sh -> .configitor/ctags/install.sh
Merge branch 'master' into vim
Merge branch 'master' into fluxbox
Merge branch 'master' into ctags
ctags: added download option into install.sh

modified:   .configitor/ctags/install.sh
fluxbox: added wallpaper as symbolic link
Merge branch 'master' into fluxbox

Conflicts:
	.gitignore
git: shell completion
vim: new color scheme