Merge pull request #7 from StompingBrokenGlass/master

Fixes to weather function
Added dertauman kick counter in silly module.  The other files modified were due to turning tabs into spaces for indentation.  tabs are bad mkay.