Make the tox tests work:
 - pylint 1.3.1 introduced some Python 2.6 incompatible syntax for sets
 - whitelisting /usr/bin/git
Merge branch 'edx-master'