Removed unused code, and some tidy
Initial work on reintroducing discount use count.
Get travis tests to work again by using PHPUnit via composer