Merge pull request #57 from thefinestsieve/beta

New icon time! (Plus other stuff.)
Merge pull request #63 from thefinestsieve/beta

Updated trait files to new naming scheme