Switch to explicit imports to fix some warnings
Merge branch '1.0-port' of github.com:snapframework/snap into 1.0-port