Add alias for wpcli using default WP path instead of subdir
Loosen clean string matching to account for variants among git versions