Changed all '/'.join into our version of urljoin (#123)