Great git-bootstrap improvements, much more generic