Added support for NVidia Optimus using bumblebee

This is experimental, since bumblebee is a rather new project, but lets
see how this works out.
Added .lock file, so git won't 'complain' while changing config while building a new image.