Merge pull request #84 from rhalff/master

Cleanup legacy loader
Merge branch 'master' of https://github.com/facebook/fb-flo