remove rvm stuff
setup boxen
remove unused java variable
re-add sublime setup to init
remove errant rvm reference
move oh-my-zsh config to includes
Merge branch 'master' into gh

Conflicts:
	gitconfig
	init.sh
use boxen for git credentials
Merge branch 'master' into gh
Merge branch 'master' into gh
Merge branch 'master' into gh
Merge branch 'master' into gh
Merge branch 'master' into gh
Merge branch 'master' into gh

Conflicts:
	init.sh
ensure that PATH set by boxen isnt overridden
clean up a bunch of stuff that conflicts with boxen
more pre-boxen cruft
Merge pull request #6 from afeld/gh

incorporate changes for boxen