Move general config into system directory
More env consolidation
Move keychain out of zsh directory
More reshuffling
Try clean up PATH setting