Add subscription_test.cpp back to Makefile (and fix some indetations)

Mike,

I fixed up this Makefile last week in Sprout, mainly because I wanted to add the subscription_test.cpp back in. Whilst I was at it, I tried to fix the indentation issues. Can you just check I haven't done anything stupid and merge it in? Cheers.