Cleaned up lines in excess of 80 characters in main.py, changed self.assert calls in test_toc.py, and updated edXpsl.sty with new macros after rebase