Upgrade and cleanup
smaller screenshot
even smaller screenshot
Merge pull request #5 from firebase/jt-upgrade-cleanup

Upgrade and cleanup