* Hooked feat thresh back up
Merge branch 'master' of https://github.com/syllog1sm/redshift
* Fixed merge
Merge branch 'master' of https://github.com/syllog1sm/redshift