PSR compliance
Updated to typhoon 0.6.0
Fixed naming of Comparator (was Comparitor), corrected a few misnamed tests.