Change method of normalising colours

Now uses a modified version of nrgbaModel, which simplifies the calculations.
Merge branch 'master' of github.com:hawx/img