Merge pull request #18 from NarPar/master

hats?
Merge pull request #19 from NarPar/master

The Workman
blahblah preferences

rah rah rasputin
Merge pull request #21 from NarPar/master

Detective Tackle and Tweaks
delay hat changes; trendsetter combo; thief limit
Merge pull request #22 from mike1072/master

delay hat changes; trendsetter combo; thief limit
Removed userprefs from github.

Because that should not be shared.
Ugh this blasted userprefs file
On a scale of one to 9...
god fucking damn it
Merge pull request #20 from leafdj/master

blahblah userpreferences you traitor and absolute jerk
Fixed merge conflict