Merge pull request #8 from huntwelch/master

merge from masta
making shiznitz more compatible
making shiznitz more compatible
settings changes
other shiznitz
Merge pull request #81 from elliottcarlson/master

Compatibility