Brian's changes, speedups and cleanups
Merge branch 'master' of https://github.com/mattmcvicar/death2chroma