overhaul
	new file:   .ackrc
	new file:   .aliases
	new file:   .bash_profile
	new file:   .bash_prompt
	new file:   .bashrc
	new file:   .bundle/config
	new file:   .commonrc
	new file:   .fonts/Menlo-Powerline.otf
	new file:   .fonts/Monaco-Powerline.otf
	new file:   .fonts/encodings.dir
	new file:   .fonts/fonts.dir
	new file:   .fonts/fonts.list
	new file:   .fonts/fonts.scale
	new file:   .gitconfig
	new file:   .gitignore
	new file:   .gitmodules
	new file:   .gvimrc
	new file:   .irbrc
	new file:   .tmux.conf
	new file:   .vim/.netrwhist
	new file:   .vim/autoload/pathogen.vim
	new file:   .vim/bundle/ack.vim/doc/ack.txt
	new file:   .vim/bundle/ack.vim/plugin/ack.vim
	new file:   .vim/bundle/clojure.vim/autoload/vimclojure.vim
	new file:   .vim/bundle/clojure.vim/autoload/vimclojure/util.vim
	new file:   .vim/bundle/clojure.vim/bin/clj
	new file:   .vim/bundle/clojure.vim/bin/clj.bat
	new file:   .vim/bundle/clojure.vim/bin/kickoff.sh
	new file:   .vim/bundle/clojure.vim/bin/ng-server
	new file:   .vim/bundle/clojure.vim/bin/ng-server.bat
	new file:   .vim/bundle/clojure.vim/doc/clojure.txt
	new file:   .vim/bundle/clojure.vim/ftdetect/clojure.vim
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure.vim
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.core.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.data.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.inspector.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.java.browse.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.java.io.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.java.javadoc.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.java.shell.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.main.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.pprint.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.repl.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.set.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.stacktrace.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.string.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.template.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.test.junit.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.test.tap.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.test.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.walk.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.xml.txt
	new file:   .vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.zip.txt
	new file:   .vim/bundle/clojure.vim/indent/clojure.vim
	new file:   .vim/bundle/clojure.vim/plugin/clojure.vim
	new file:   .vim/bundle/clojure.vim/syntax/clojure.vim
	new file:   .vim/bundle/cocoa.vim/after/syntax/cocoa_keywords.vim
	new file:   .vim/bundle/cocoa.vim/after/syntax/objc_enhanced.vim
	new file:   .vim/bundle/cocoa.vim/autoload/objc/cocoacomplete.vim
	new file:   .vim/bundle/cocoa.vim/autoload/objc/man.vim
	new file:   .vim/bundle/cocoa.vim/autoload/objc/method_builder.vim
	new file:   .vim/bundle/cocoa.vim/autoload/objc/method_list.vim
	new file:   .vim/bundle/cocoa.vim/autoload/objc/pum_snippet.vim
	new file:   .vim/bundle/cocoa.vim/doc/cocoa.txt
	new file:   .vim/bundle/cocoa.vim/ftplugin/objc_cocoa_mappings.vim
	new file:   .vim/bundle/cocoa.vim/lib/cocoa_indexes/classes.txt
	new file:   .vim/bundle/cocoa.vim/lib/cocoa_indexes/constants.txt
	new file:   .vim/bundle/cocoa.vim/lib/cocoa_indexes/functions.txt
	new file:   .vim/bundle/cocoa.vim/lib/cocoa_indexes/methods.txt.gz
	new file:   .vim/bundle/cocoa.vim/lib/cocoa_indexes/notifications.txt
	new file:   .vim/bundle/cocoa.vim/lib/cocoa_indexes/types.txt
	new file:   .vim/bundle/cocoa.vim/lib/extras/README-if-you-like
	new file:   .vim/bundle/cocoa.vim/lib/extras/README_if_you_like
	new file:   .vim/bundle/cocoa.vim/lib/extras/build_syntaxfile.py
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_classes.py
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_definitions.py
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_definitions.pyc
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/classes.txt
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/constants.txt
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/functions.txt
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/methods.txt.gz
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/notifications.txt
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/types.txt
	new file:   .vim/bundle/cocoa.vim/lib/extras/cocoa_methods.py
	new file:   .vim/bundle/cocoa.vim/lib/extras/superclasses
	new file:   .vim/bundle/cocoa.vim/lib/extras/superclasses.m
	new file:   .vim/bundle/cocoa.vim/lib/get_methods.sh
	new file:   .vim/bundle/cocoa.vim/plugin/cocoa.vim
	new file:   .vim/bundle/ctrlp.vim
	new file:   .vim/bundle/fish.vim
	new file:   .vim/bundle/histwin.vim/Makefile
	new file:   .vim/bundle/histwin.vim/README
	new file:   .vim/bundle/histwin.vim/autoload/histwin.vim
	new file:   .vim/bundle/histwin.vim/doc/histwin.txt
	new file:   .vim/bundle/histwin.vim/histwin.vba
	new file:   .vim/bundle/histwin.vim/plugin/histwinPlugin.vim
	new file:   .vim/bundle/html5.vim
	new file:   .vim/bundle/jade.vim
	new file:   .vim/bundle/nerdcommenter.vim/.gitignore
	new file:   .vim/bundle/nerdcommenter.vim/Rakefile
	new file:   .vim/bundle/nerdcommenter.vim/doc/NERD_commenter.txt
	new file:   .vim/bundle/nerdcommenter.vim/plugin/NERD_commenter.vim
	new file:   .vim/bundle/nerdtree
	new file:   .vim/bundle/nuvim
	new file:   .vim/bundle/pastie.vim/doc/pastie.txt
	new file:   .vim/bundle/pastie.vim/plugin/pastie.vim
	new file:   .vim/bundle/rails.vim/.gitignore
	new file:   .vim/bundle/rails.vim/README
	new file:   .vim/bundle/rails.vim/Rakefile
	new file:   .vim/bundle/rails.vim/autoload/rails.vim
	new file:   .vim/bundle/rails.vim/doc/rails.txt
	new file:   .vim/bundle/rails.vim/plugin/rails.vim
	new file:   .vim/bundle/rainbow_parentheses.vim
	new file:   .vim/bundle/repeat.vim/autoload/repeat.vim
	new file:   .vim/bundle/snipmate.vim
	new file:   .vim/bundle/taglist-plus.vim/.gitignore
	new file:   .vim/bundle/taglist-plus.vim/README.md
	new file:   .vim/bundle/taglist-plus.vim/doc/taglist-plus.txt
	new file:   .vim/bundle/taglist-plus.vim/plugin/taglist-plus.vim
	new file:   .vim/bundle/vim-coffee-script
	new file:   .vim/bundle/vim-colors-solarized
	new file:   .vim/bundle/vim-haml
	new file:   .vim/bundle/vim-handlebars
	new file:   .vim/bundle/vim-javascript
	new file:   .vim/bundle/vim-less
	new file:   .vim/bundle/vim-markdown
	new file:   .vim/bundle/vim-octopress
	new file:   .vim/bundle/vim-powerline
	new file:   .vim/bundle/vim-racket
	new file:   .vim/bundle/vim-rails
	new file:   .vim/bundle/vim-ruby
	new file:   .vim/bundle/vim-slim
	new file:   .vim/bundle/vim-stylus
	new file:   .vim/bundle/vim-surround
	new file:   .vim/colors/badwolf.vim
	new file:   .vim/colors/darkburn.vim
	new file:   .vim/ftplugin/javascript.vim
	new file:   .vim/ftplugin/javascript/jshint.vim
	new file:   .vim/ftplugin/javascript/jshint/jshint-core.js
	new file:   .vim/ftplugin/javascript/jshint/runjshint.js
	new file:   .vim/ftplugin/javascript/jshint/runjshint.wsf
	new file:   .vim/ftplugin/ri.vim
	new file:   .vim/snippets/_-gf3.snippets
	new file:   .vim/snippets/css-gf3.snippets
	new file:   .vim/snippets/html-gf3.snippets
	new file:   .vim/snippets/javascript-gf3.snippets
	new file:   .vim/snippets/sass-gf3.snippets
	new file:   .vim/syntax/git-diff.vim
	new file:   .vim/syntax/git-log.vim
	new file:   .vim/syntax/git-status.vim
	new file:   .vim/syntax/json.vim
	new file:   .vim/syntax/ri.vim
	new file:   .vim/syntax/ruby.vim
	new file:   .vimrc
	new file:   .zshrc
Merge branch 'master' of github.com:mattfield/dotfiles

* 'master' of github.com:mattfield/dotfiles:
  bundle, html5, octopress 	new file:   vim/bundle/html5.vim 	deleted:    vim/bundle/surround.vim/doc/surround.txt 	deleted:    vim/bundle/surround.vim/plugin/surround.vim 	new file:   vim/bundle/vim-octopress 	modified:   vim/bundle/fish.vim (untracked content) 	modified:   vim/bundle/jade.vim (untracked content) 	modified:   vim/bundle/nuvim (untracked content) 	modified:   vim/bundle/rainbow_parentheses.vim (untracked content) 	modified:   vim/bundle/snipmate.vim (untracked content) 	modified:   vim/bundle/vim-colors-solarized (untracked content) 	modified:   vim/bundle/vim-handlebars (untracked content) 	modified:   vim/bundle/vim-octopress (untracked content) 	modified:   vim/bundle/vim-stylus (untracked content) 	modified:   vim/bundle/vim-surround (untracked content)
  removed fugitve! 	deleted:    vim/bundle/vim-fugitive/.gitignore 	deleted:    vim/bundle/vim-fugitive/README.markdown 	deleted:    vim/bundle/vim-fugitive/doc/fugitive.txt 	deleted:    vim/bundle/vim-fugitive/plugin/fugitive.vim
  added fugitive 	new file:   vim/bundle/vim-fugitive/.gitignore 	new file:   vim/bundle/vim-fugitive/README.markdown 	new file:   vim/bundle/vim-fugitive/doc/fugitive.txt 	new file:   vim/bundle/vim-fugitive/plugin/fugitive.vim
  vi buffer mode in tmux, tree colorization alias in zsh
  completely forgot about ctrlp 	new file:   vim/bundle/ctrlp.vim/.gitignore 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/buffertag.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/changes.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/dir.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/line.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/mixed.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/mrufiles.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/quickfix.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/rtscript.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/tag.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/undo.vim 	new file:   vim/bundle/ctrlp.vim/autoload/ctrlp/utils.vim 	new file:   vim/bundle/ctrlp.vim/doc/ctrlp.txt 	new file:   vim/bundle/ctrlp.vim/plugin/ctrlp.vim 	new file:   vim/bundle/ctrlp.vim/readme.md 	modified:   vim/bundle/fish.vim (untracked content) 	modified:   vim/bundle/jade.vim (untracked content) 	modified:   vim/bundle/snipmate.vim (untracked content) 	modified:   vim/bundle/vim-colors-solarized (untracked content)
  new file:   .fonts/Monaco-Powerline.otf 	new file:   .fonts/encodings.dir 	new file:   .fonts/fonts.dir 	new file:   .fonts/fonts.list 	new file:   .fonts/fonts.scale 	modified:   .vimrc 	new file:   vim/bundle/vim-powerline/.gitignore 	new file:   vim/bundle/vim-powerline/README.rst 	new file:   vim/bundle/vim-powerline/autoload/Pl.vim 	new file:   vim/bundle/vim-powerline/autoload/Pl/Colorscheme.vim 	new file:   vim/bundle/vim-powerline/autoload/Pl/Hi.vim 	new file:   vim/bundle/vim-powerline/autoload/Pl/Match.vim 	new file:   vim/bundle/vim-powerline/autoload/Pl/Mod.vim 	new file:   vim/bundle/vim-powerline/autoload/Pl/Parser.vim 	new file:   vim/bundle/vim-powerline/autoload/Pl/Segment.vim 	new file:   vim/bundle/vim-powerline/autoload/Pl/Theme.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Colorschemes/default.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Colorschemes/skwp.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Functions.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Functions/aurum.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Functions/cfi.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Functions/ft_man.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Functions/fugitive.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Functions/hgrev.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Functions/syntastic.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Matches.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/aurum.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/cfi.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/ctrlp.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/ft_man.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/fugitive.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/hgrev.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/rvm.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/syntastic.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Segments/virtualenv.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Themes/default.vim 	new file:   vim/bundle/vim-powerline/autoload/Powerline/Themes/skwp.vim 	new file:   vim/bundle/vim-powerline/doc/Powerline.txt 	new file:   vim/bundle/vim-powerline/fontpatcher/PowerlineSymbols.sfd 	new file:   vim/bundle/vim-powerline/fontpatcher/README.rst 	new file:   vim/bundle/vim-powerline/fontpatcher/fontpatcher 	new file:   vim/bundle/vim-powerline/plugin/Powerline.vim 	modified:   vim/bundle/fish.vim (untracked content) 	modified:   vim/bundle/jade.vim (untracked content) 	modified:   vim/bundle/snipmate.vim (untracked content) 	modified:   vim/bundle/vim-colors-solarized (untracked content)
  updated bundles 	modified:   .vimrc 	new file:   vim/bundle/fish.vim 	new file:   vim/bundle/jade.vim 	new file:   vim/bundle/nuvim 	new file:   vim/bundle/rainbow_parentheses.vim 	new file:   vim/bundle/vim-haml 	new file:   vim/bundle/vim-handlebars 	new file:   vim/bundle/vim-racket 	new file:   vim/bundle/vim-ruby 	new file:   vim/bundle/vim-slim 	new file:   vim/bundle/vim-stylus 	modified:   vim/bundle/fish.vim (untracked content) 	modified:   vim/bundle/jade.vim (untracked content) 	modified:   vim/bundle/snipmate.vim (untracked content) 	modified:   vim/bundle/vim-colors-solarized (untracked content)
  removed gem and rakefiles, modified readme 	deleted:    Gemfile 	deleted:    Gemfile.lock 	modified:   README.md 	deleted:    Rakefile 	deleted:    bootstrap.sh
  proper vim folder 	deleted:    .vim 	new file:   vim/.netrwhist 	new file:   vim/autoload/pathogen.vim 	new file:   vim/bundle/ack.vim/doc/ack.txt 	new file:   vim/bundle/ack.vim/plugin/ack.vim 	new file:   vim/bundle/clojure.vim/autoload/vimclojure.vim 	new file:   vim/bundle/clojure.vim/autoload/vimclojure/util.vim 	new file:   vim/bundle/clojure.vim/bin/clj 	new file:   vim/bundle/clojure.vim/bin/clj.bat 	new file:   vim/bundle/clojure.vim/bin/kickoff.sh 	new file:   vim/bundle/clojure.vim/bin/ng-server 	new file:   vim/bundle/clojure.vim/bin/ng-server.bat 	new file:   vim/bundle/clojure.vim/doc/clojure.txt 	new file:   vim/bundle/clojure.vim/ftdetect/clojure.vim 	new file:   vim/bundle/clojure.vim/ftplugin/clojure.vim 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.core.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.data.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.inspector.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.java.browse.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.java.io.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.java.javadoc.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.java.shell.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.main.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.pprint.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.repl.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.set.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.stacktrace.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.string.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.template.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.test.junit.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.test.tap.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.test.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.walk.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.xml.txt 	new file:   vim/bundle/clojure.vim/ftplugin/clojure/completions-clojure.zip.txt 	new file:   vim/bundle/clojure.vim/indent/clojure.vim 	new file:   vim/bundle/clojure.vim/plugin/clojure.vim 	new file:   vim/bundle/clojure.vim/syntax/clojure.vim 	new file:   vim/bundle/cocoa.vim/after/syntax/cocoa_keywords.vim 	new file:   vim/bundle/cocoa.vim/after/syntax/objc_enhanced.vim 	new file:   vim/bundle/cocoa.vim/autoload/objc/cocoacomplete.vim 	new file:   vim/bundle/cocoa.vim/autoload/objc/man.vim 	new file:   vim/bundle/cocoa.vim/autoload/objc/method_builder.vim 	new file:   vim/bundle/cocoa.vim/autoload/objc/method_list.vim 	new file:   vim/bundle/cocoa.vim/autoload/objc/pum_snippet.vim 	new file:   vim/bundle/cocoa.vim/doc/cocoa.txt 	new file:   vim/bundle/cocoa.vim/ftplugin/objc_cocoa_mappings.vim 	new file:   vim/bundle/cocoa.vim/lib/cocoa_indexes/classes.txt 	new file:   vim/bundle/cocoa.vim/lib/cocoa_indexes/constants.txt 	new file:   vim/bundle/cocoa.vim/lib/cocoa_indexes/functions.txt 	new file:   vim/bundle/cocoa.vim/lib/cocoa_indexes/methods.txt.gz 	new file:   vim/bundle/cocoa.vim/lib/cocoa_indexes/notifications.txt 	new file:   vim/bundle/cocoa.vim/lib/cocoa_indexes/types.txt 	new file:   vim/bundle/cocoa.vim/lib/extras/README-if-you-like 	new file:   vim/bundle/cocoa.vim/lib/extras/README_if_you_like 	new file:   vim/bundle/cocoa.vim/lib/extras/build_syntaxfile.py 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_classes.py 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_definitions.py 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_definitions.pyc 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/classes.txt 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/constants.txt 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/functions.txt 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/methods.txt.gz 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/notifications.txt 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_indexes/types.txt 	new file:   vim/bundle/cocoa.vim/lib/extras/cocoa_methods.py 	new file:   vim/bundle/cocoa.vim/lib/extras/superclasses 	new file:   vim/bundle/cocoa.vim/lib/extras/superclasses.m 	new file:   vim/bundle/cocoa.vim/lib/get_methods.sh 	new file:   vim/bundle/cocoa.vim/plugin/cocoa.vim 	new file:   vim/bundle/histwin.vim/Makefile 	new file:   vim/bundle/histwin.vim/README 	new file:   vim/bundle/histwin.vim/autoload/histwin.vim 	new file:   vim/bundle/histwin.vim/doc/histwin.txt 	new file:   vim/bundle/histwin.vim/histwin.vba 	new file:   vim/bundle/histwin.vim/plugin/histwinPlugin.vim 	new file:   vim/bundle/nerdcommenter.vim/.gitignore 	new file:   vim/bundle/nerdcommenter.vim/Rakefile 	new file:   vim/bundle/nerdcommenter.vim/doc/NERD_commenter.txt 	new file:   vim/bundle/nerdcommenter.vim/plugin/NERD_commenter.vim 	new file:   vim/bundle/nerdtree 	new file:   vim/bundle/pastie.vim/doc/pastie.txt 	new file:   vim/bundle/pastie.vim/plugin/pastie.vim 	new file:   vim/bundle/rails.vim/.gitignore 	new file:   vim/bundle/rails.vim/README 	new file:   vim/bundle/rails.vim/Rakefile 	new file:   vim/bundle/rails.vim/autoload/rails.vim 	new file:   vim/bundle/rails.vim/doc/rails.txt 	new file:   vim/bundle/rails.vim/plugin/rails.vim 	new file:   vim/bundle/repeat.vim/autoload/repeat.vim 	new file:   vim/bundle/snipmate.vim 	new file:   vim/bundle/surround.vim/doc/surround.txt 	new file:   vim/bundle/surround.vim/plugin/surround.vim 	new file:   vim/bundle/taglist-plus.vim/.gitignore 	new file:   vim/bundle/taglist-plus.vim/README.md 	new file:   vim/bundle/taglist-plus.vim/doc/taglist-plus.txt 	new file:   vim/bundle/taglist-plus.vim/plugin/taglist-plus.vim 	new file:   vim/bundle/vim-coffee-script 	new file:   vim/bundle/vim-colors-solarized 	new file:   vim/bundle/vim-javascript 	new file:   vim/bundle/vim-less 	new file:   vim/bundle/vim-markdown 	new file:   vim/bundle/vim-rails 	new file:   vim/bundle/vim-surround 	new file:   vim/colors/badwolf.vim 	new file:   vim/colors/darkburn.vim 	new file:   vim/ftplugin/javascript.vim 	new file:   vim/ftplugin/javascript/jshint.vim 	new file:   vim/ftplugin/javascript/jshint/jshint-core.js 	new file:   vim/ftplugin/javascript/jshint/runjshint.js 	new file:   vim/ftplugin/javascript/jshint/runjshint.wsf 	new file:   vim/ftplugin/ri.vim 	new file:   vim/snippets/_-gf3.snippets 	new file:   vim/snippets/css-gf3.snippets 	new file:   vim/snippets/html-gf3.snippets 	new file:   vim/snippets/javascript-gf3.snippets 	new file:   vim/snippets/sass-gf3.snippets 	new file:   vim/syntax/git-diff.vim 	new file:   vim/syntax/git-log.vim 	new file:   vim/syntax/git-status.vim 	new file:   vim/syntax/json.vim 	new file:   vim/syntax/ri.vim 	new file:   vim/syntax/ruby.vim
  massive overhaul of vim config based on quick-vim 	modified:   .gvimrc     modified:   .vimrc
  added aliases 	modified:   .zshrc
  updated tmux.conf and vimrc 	modified:   .tmux.conf 	modified:   .vimrc
  updated .gitignore 	modified:   .gitignore
  adjusted HISTSIZE and SAVEHIST to keep zsh load speedy 	modified:   .zshrc
  rm DS_Store 	deleted:    .DS_Store
  .gitignore update 	new file:   .gitignore
  removed use of arrow keys across the board 	modified:   .vimrc
  First commit, full dotfiles 	new file:   .DS_Store 	new file:   .ackrc 	new file:   .aliases 	new file:   .aprc 	new file:   .bash_profile 	new file:   .bash_prompt 	new file:   .commonrc 	new file:   .fonts/.DS_Store 	new file:   .fonts/Menlo-Powerline.otf 	new file:   .functions 	new file:   .gemrc 	new file:   .gitattributes 	new file:   .gitconfig 	new file:   .gitmodules 	new file:   .gvimrc 	new file:   .hgext/hg-prompt/.hg/00changelog.i 	new file:   .hgext/hg-prompt/.hg/branch 	new file:   .hgext/hg-prompt/.hg/branchheads.cache 	new file:   .hgext/hg-prompt/.hg/dirstate 	new file:   .hgext/hg-prompt/.hg/hgrc 	new file:   .hgext/hg-prompt/.hg/requires 	new file:   .hgext/hg-prompt/.hg/store/00changelog.i 	new file:   .hgext/hg-prompt/.hg/store/00manifest.i 	new file:   .hgext/hg-prompt/.hg/store/data/.hgignore.i 	new file:   .hgext/hg-prompt/.hg/store/data/.hgtags.i 	new file:   .hgext/hg-prompt/.hg/store/data/_r_e_a_d_m_e.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/404.html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/base.html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/document.html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/listing.html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/macros/html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/markdoc-default/404.html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/markdoc-default/base.html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/markdoc-default/document.html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.templates/markdoc-default/listing.html.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/.venv.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/markdoc.yaml.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/publish.sh.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/static/media/css/layout.css.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/static/media/css/pygments.css.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/static/media/css/reset.css.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/static/media/css/typography.css.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/wiki/documentation/index.mdown.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/wiki/documentation/keywords/index.mdown.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/wiki/documentation/samples/index.mdown.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/wiki/documentation/usage/index.mdown.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/wiki/index.mdown.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/wiki/installation/index.mdown.i 	new file:   .hgext/hg-prompt/.hg/store/data/docs/wiki/quickstart/index.mdown.i 	new file:   .hgext/hg-prompt/.hg/store/data/prompt.py.i 	new file:   .hgext/hg-prompt/.hg/store/data/tests/____init____.py.i 	new file:   .hgext/hg-prompt/.hg/store/data/tests/test__branch.py.i 	new file:   .hgext/hg-prompt/.hg/store/data/tests/test__node.py.i 	new file:   .hgext/hg-prompt/.hg/store/data/tests/test__none.py.i 	new file:   .hgext/hg-prompt/.hg/store/data/tests/test__rev.py.i 	new file:   .hgext/hg-prompt/.hg/store/data/tests/test__tip.py.i 	new file:   .hgext/hg-prompt/.hg/store/data/tests/test__update.py.i 	new file:   .hgext/hg-prompt/.hg/store/data/tests/util.py.i 	new file:   .hgext/hg-prompt/.hg/store/fncache 	new file:   .hgext/hg-prompt/.hg/store/undo 	new file:   .hgext/hg-prompt/.hg/tags.cache 	new file:   .hgext/hg-prompt/.hg/undo.branch 	new file:   .hgext/hg-prompt/.hg/undo.desc 	new file:   .hgext/hg-prompt/.hg/undo.dirstate 	new file:   .hgext/hg-prompt/.hgignore 	new file:   .hgext/hg-prompt/.hgtags 	new file:   .hgext/hg-prompt/LOL 	new file:   .hgext/hg-prompt/README 	new file:   .hgext/hg-prompt/docs/.venv 	new file:   .hgext/hg-prompt/docs/markdoc.yaml 	new file:   .hgext/hg-prompt/docs/publish.sh 	new file:   .hgext/hg-prompt/docs/static/media/css/layout.css 	new file:   .hgext/hg-prompt/docs/static/media/css/pygments.css 	new file:   .hgext/hg-prompt/docs/static/media/css/reset.css 	new file:   .hgext/hg-prompt/docs/static/media/css/typography.css 	new file:   .hgext/hg-prompt/docs/wiki/documentation/index.mdown 	new file:   .hgext/hg-prompt/docs/wiki/documentation/keywords/index.mdown 	new file:   .hgext/hg-prompt/docs/wiki/documentation/samples/index.mdown 	new file:   .hgext/hg-prompt/docs/wiki/documentation/usage/index.mdown 	new file:   .hgext/hg-prompt/docs/wiki/index.mdown 	new file:   .hgext/hg-prompt/docs/wiki/installation/index.mdown 	new file:   .hgext/hg-prompt/docs/wiki/quickstart/index.mdown 	new file:   .hgext/hg-prompt/prompt.py 	new file:   .hgext/hg-prompt/prompt.pyc 	new file:   .hgext/hg-prompt/tests/__init__.py 	new file:   .hgext/hg-prompt/tests/test_branch.py 	new file:   .hgext/hg-prompt/tests/test_node.py 	new file:   .hgext/hg-prompt/tests/test_none.py 	new file:   .hgext/hg-prompt/tests/test_rev.py 	new file:   .hgext/hg-prompt/tests/test_tip.py 	new file:   .hgext/hg-prompt/tests/test_update.py 	new file:   .hgext/hg-prompt/tests/util.py 	new file:   .hgext/hgshelve/.hg/00changelog.i 	new file:   .hgext/hgshelve/.hg/branch 	new file:   .hgext/hgshelve/.hg/branchheads.cache 	new file:   .hgext/hgshelve/.hg/dirstate 	new file:   .hgext/hgshelve/.hg/hgrc 	new file:   .hgext/hgshelve/.hg/requires 	new file:   .hgext/hgshelve/.hg/store/00changelog.i 	new file:   .hgext/hgshelve/.hg/store/00manifest.i 	new file:   .hgext/hgshelve/.hg/store/data/hgshelve.py.i 	new file:   .hgext/hgshelve/.hg/store/data/shelve.py.i 	new file:   .hgext/hgshelve/.hg/store/data/test-shelve-color.i 	new file:   .hgext/hgshelve/.hg/store/data/test-shelve-color.out.i 	new file:   .hgext/hgshelve/.hg/store/data/test-shelve.i 	new file:   .hgext/hgshelve/.hg/store/data/test-shelve.out.i 	new file:   .hgext/hgshelve/.hg/store/fncache 	new file:   .hgext/hgshelve/.hg/store/undo 	new file:   .hgext/hgshelve/.hg/tags.cache 	new file:   .hgext/hgshelve/.hg/undo.branch 	new file:   .hgext/hgshelve/.hg/undo.desc 	new file:   .hgext/hgshelve/.hg/undo.dirstate 	new file:   .hgext/hgshelve/hgshelve.py 	new file:   .hgext/hgshelve/hgshelve.pyc 	new file:   .hgext/hgshelve/test-shelve 	new file:   .hgext/hgshelve/test-shelve-color 	new file:   .hgext/hgshelve/test-shelve-color.out 	new file:   .hgext/hgshelve/test-shelve.out 	new file:   .hgignore 	new file:   .hgrc 	new file:   .inputrc 	new file:   .irbrc 	new file:   .rbenv 	new file:   .tmux.conf 	new file:   .vim 	new file:   .vimrc 	new file:   .zshrc 	new file:   Gemfile 	new file:   Gemfile.lock 	new file:   README.md 	new file:   Rakefile 	new file:   bootstrap.sh

Conflicts:
	.bash_prompt
	.fonts/Menlo-Powerline.otf
	.fonts/Monaco-Powerline.otf
	.fonts/encodings.dir
	.fonts/fonts.dir
	.fonts/fonts.list
	.fonts/fonts.scale
	.gitconfig
	.gitignore
	.irbrc
	.tmux.conf
	.zshrc
overhaul
	new file:   bundle/config
	new file:   fonts/Menlo-Powerline.otf
	new file:   fonts/Monaco-Powerline.otf
	new file:   fonts/encodings.dir
	new file:   fonts/fonts.dir
	new file:   fonts/fonts.list
	new file:   fonts/fonts.scale