also, address git vs git-core by allowing either to satisfy our dependency

All these crazy changes...  it's almost like we're going between two LTS
releases or something!