Fixed syntax errors
Merge remote-tracking branch 'untitaker/sprint-branch' into sprint-branch
Random fixes
Fixed urls.py in py2
Fixed missing literal pref
Random