Tweaked the CircleCI instructions

Reflects current state of CircleCI.  Also adjusted the xdebug.ini editing script so we don't need as many lines