Fixed issues with merge with Scott's master's branch in 'sifting.py' that I missed when performing the merge.