Fix globe demo
Reenable the globe demo
Merge pull request #46 from dstockwell/globe

Globe
Merge remote-tracking branch 'upstream/master' into HEAD