Encode url before using urlparse methods [RD-64]
Merge branch 'master' into source-code-encoding

Conflicts:
	redirect/tests/views.py
Ensure the new query string and old are both not unicode strings [RD-64]
Fix unnecessary encode [RD-64]
Fix typo [RD-64]
Merge pull request #69 from DirectEmployers/source-code-encoding

Encode url before using urllib methods [RD-64]