Minor cleanups on imports
Merge branch 'master' of https://github.com/edwardcapriolo/teknek-core