Merge branch 'release/2011_11_03-08_20'
Merge branch 'release/2011_11_09-10_58'
Merge branch 'release/2011_10_29-07_40'
Rename cron.log
Merge branch 'release/2011_12_19-21_14'

Conflicts:
	config/schedule.rb
Merge branch 'release/2011_12_20-20_03'
Merge branch 'release/2012_04_26-11_18'
update guard
use sqlite for tests, faster?
update for new path
and a newline to output
Got rid of most hash rockets, switch Jeeves to H&A

 - Home & Away should always be available
 - classification is dodgy, need to fix that
update counts now we have new data for channel 7
Pull latest channel 7 data for testing
Merge branch 'master' into develop