Tidying up Config

Got rid of the php variables now we're using the 'defines'