made work for rachels env
fixes for being me
Merge branch 'master' of github.com:mccuistion/dotfiles

Conflicts:
	bash/aliases
	bash/functions
	bash/paths
	bin/json-pretty
	rubylib/wukong
	rubylib/wukong.rb
disinfecting of flip-ness