rename models.IndividualIcons into models.Icon
reformat src allowing longer lines of 120
some minor code cleanup
Merge pull request #32 from vidma/code_cleanup

Code cleanup