Fix import ordering
Merge pull request #30 from square/rice/fix_imports

Fix import ordering