Updated to get to work with sauce labs
Updated to fix issues with tunnels and sauce labs