escape the '&' used to join the query string. Now passed html validation.
Update unit test to use escaped ampersands in comparision.
Use conditional escaping to handle '&' used to join the query string.
Merge pull request #59 from drodger/master

escape the '&' used to join the query string. Now passes html validation.