gdfm is replaced with 'git df'. Made 'sp' more generic.