Rebased with master

Matt Bertrand · Matt Bertrand · commit 872aacdf13be · 2017-02-10T09:42:33.000-05:00
diff --git a/dataqs/helpers.py b/dataqs/helpers.py
@@ -359,7 +359,6 @@ def asciier(txt):
     norm_txt = re.sub('\s+', ' ', unicodedata.normalize('NFD', txt))
     ascii_txt = norm_txt.encode('ascii', 'ignore').decode('ascii')
     return ascii_txt
-<<<<<<< HEAD
 
 
 class MockResponse(object):
