Fixed Lint errors, added python_shell=False
added quotes around set
Merged conflicts