fire alarm
forgot batch
merging in upstream
many fixes
got around the progressive bug
resets cron timeout now
merge fix again?
Merge pull request #6 from willtp87/7.x.rules

7.x.rules