camera.xml additions and fixes from darktable

Hey,

You know the drill, lots of new stuff from us.

Please do briefly check my commits before pulling :)

Thanks,
Pascal de Bruijn