Google keeps spitting out different urls to their users. Our users
aren't going to understand how to massage these to the correct
format, so we have to try keep up. Bad google, bad.

Change-Id: I06901c142da5db179ef5361d9939ae9a03ead14e
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>