Add Escape handling and support new default installs for git

Not sure if you'd rather see these as separate branches so you get two individual pull requests or not.