Use vi-like shortcuts in bash
Reorg bootstrap and python requirements