Added survey.
PEP8 compliance (except for the usual long lines needed).
Added Rage Against The Machine option.
Merge pull request #23 from Hasimir/master

A few little updates