Merge pull request #3 from huntwelch/master

Pull from master
Update cortex.py

Add 'weather' key to indicate current weather condition
Merge pull request #7 from elliottcarlson/master

weather