source allura env
Merge branch 'sandbox' of https://github.com/jetmind/dot into sandbox

Conflicts:
	zsh/zshrc
Merge remote-tracking branch 'origin/master' into sandbox

Conflicts:
	vimrc
zsh theme fix
Merge branch 'master' into sandbox