General estate tax subtraction amount increase; combined cap on the subtractions for qualified small business property and qualified farm property increase