add my personal dotfiles
homebrew: clear (rvm) environment
vim: fix mac issues
Merge branch 'upstream'
update my vimrc
fix chef bootstrap
Merge branch 'upstream'
cleanup chef script
update my dotfiles
add filetype auto commands
do not show colordiff header
upgrade to ruby-2.1.0
enable jruby debug mode by default
disable neocomplete for now
add focus and escape code optimizations for iterm/tmux
update JRUBY_OPTS
Merge branch 'upstream'

Conflicts:
	Gemfile.lock
	bin/chef
Merge branch 'upstream'
Merge branch 'upstream'
move solo configs to nodes