[#706] PEP8 & Pylint W0403 Compliance

Let me know how it looks.

http://sleepanarchy.com/p/wWowqh
Putting the entire tuple in the line below looks better, IMHO.