from perlsupport
Merge branch 'master' of github.com:JustinHop/Profile
Merge branch 'master' of github.com:JustinHop/Profile
Merge branch 'master' of github.com:JustinHop/Profile
env stuff
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	zshenv
Merge branch 'master' of github.com:JustinHop/Profile
Changes from bld1. Stuff for rpms
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	.gitignore
	zsh/prompt_jclint_setup
	zshenv
	zshrc
Missed changes on bld1.sys.tools1.websys.tmcs
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	zshrc