Update Guzzle and improve getCurrentUrl method

This pull request improves the getCurrentUrl method, so that sites that don't have URL rewriting turned on or don't exist at the base URL for a given domain also work correctly.