import order fixes for future automated checking
a few small fixes
revert one import order change
Merge pull request #829 from reaperhulk/import-order-fixer

import order fixes for future automated checking