Changed from 4 to 6 hour tweet increments.
Merge remote-tracking branch 'origin/master'