Merge pull request #1 from nathanmarz/master

merge changes from nathanmarz/storm
Update NOTICE
Merge pull request #485 from anfeng/master

Add Yahoo! copyright notice