Remove bot line from tweet
Fix merge conflict with heroku
Test current hour
Change PM times to 24 hour, d'oh