Add KeyMap4MacBook for hyper and disable sysdiag
Add jinja2 and prettyYAML
Merged st3 changes