Updated shell config
Merge branch 'master' of github.com:quynguyen/shell-config

Conflicts:
	common/shellpath