Merge pull request #13 from jmoses/master

MATH
lol
Weather refactor to allow secondary sources
Update MANIFEST
Try and fetch actual tweet content