s/tracking/upstream/
move list of bundles to appropriate file
zsh stuff