Revert "Merge pull request #43 from eileenmcnaughton/master"

This reverts commit 2d457f1a25c48a334e0a4d133d2f5b1e1938b1ae, reversing
changes made to 846b1a9d0def635fb4738bf0cf8305f3c3a44084.
CRM-14653 installer/uninstaller fix
fixed discount calculation for quick config price sets
Merge pull request #65 from dlobo/discount-fixes

Discount fixes