added 'tommorow' and 'today' triggers; rewrote weather
query no longer required