nasty bug fixes for independent rgb

Signed-off-by: Matthew Webb <mawebb@math.byu.edu>
Merge branch 'independent'

Signed-off-by: Matthew Webb <mawebb@math.byu.edu>

Conflicts:
	imseg/factors.py
how many bugs

Signed-off-by: Matthew Webb <mawebb@math.byu.edu>
Merge branch 'master' of https://github.com/abefrandsen/imseg
Most sections, except result images and data

Signed-off-by: Matthew Webb <mawebb@math.byu.edu>
Added a method to sample from the prior on cluster assignments, made the
wishart sampling more efficient.
Merge branch 'master' of https://github.com/m4webb/imseg

Conflicts:
	imseg/scratch.py
	report.tex