some stuff
Merge branch 'cljdev' of github.com:theJohnnyBrown/dotfiles into cljdev

Conflicts:
	.bashrc