Merge pull request #13 from settinghead/master

upgrade to meteor 1.0
Merge remote-tracking branch 'upstream/master'