Remove sagepay template, tidy up templates generaly and add more robust callbacks from payment methods