Updated next URL handling to not duplicate querystring args
Merge pull request #21 from robhudson/next-updates

Updated next URL handling to not duplicate querystring args