fixed a couple of bugs.
Merge branch 'master' of git://github.com/jonathantopf/mescaline_utils

Conflicts:
	mescaline_setup.py
Merge branch 'master' of git://github.com/jonathantopf/mescaline_utils
fixed intensity multiplier for non-physical lights.
added support for depth-of-field.
Merge pull request #2 from dictoon/master

fixed intensity multiplier for non-physical lights and added support for depth-of-field.