fire alarm
forgot batch
merging in upstream
many fixes
got around the progressive bug
added travis file and coding standards
fixed coding standards
Added ignore for watchdog message
Changed watchdog to use placeholders instead of variables
commented out ant buildfile
Merge pull request #7 from philsogaDGI/7.x

Setup Travis and Tests
resets cron timeout now
merge fix again?
Merge pull request #6 from willtp87/7.x.rules

7.x.rules
merge conflict