Renamed make.sh to setup.sh
Renamed make.sh to setup.sh
Added wp-cli submodule and updated alias and source includes