Merge pull request #599 from alex/import-sort

Sort our imports