removed a bunch of unstable stuff that accidentally made it in
Merge branches 'master' and 'stacker'
Fixed color segmentation test
Cleaned up master branch
Writing c++ woohoo