Merge branch 'master' into schooly
switching to fix hbon regex
finished up threading changes
Merge branch 'schooly'