This branch contains Reimar's work on eliminating (most of) the volume factors. Unit tests are passing, but the demos need more adjusting.
Please test this as hard as you can! (And add new unit tests if appropriate...) @reimar, @kjako, @ensslint, @parras: this means you ;)