Add the bundle directory to Python import path and use simple imports

Like this no special care needs to be given to modules that are bundled and to
those that aren't. Either the bundled module or the system installed
will be installed. This makes un-bundling easier - just drop the system-wide
available module from the bundle directory and be done with it.