cleanup, use keychain

- whitespace cleanup
- sorting
- add keychain to packages
- eval keychain on new shell