p4merge, sourcetree, virtualenvwrapper
vim: YCM, split defaults
call it
Merge branch 'master' of https://github.com/3nth/homebase

* 'master' of https://github.com/3nth/homebase:
  vim editor
  the_silver_searcher
  tmux.conf
  more readme. spit n shine.
  meh
  more indent
  need README. don't need this other stuff
  finishing touches
  quotes prevent ~ expansion
  backward logic
  Update homebase.sh
  not used
  stuf

Conflicts:
	dotfiles/gitconfig
	dotfiles/source/50_python.sh