PriceSet BAO - fix spelling & remove unused var
formatting & comment fixes
api contribution page default to is_active
test - fix api_mail_settings test
Merge pull request #3422 from eileenmcnaughton/test_fixes

Test fixes & a few minor tidy ups, fix mail_settings in particular