Change the inheritance chain a bit

puppet::params > puppet > puppet::server

I hope this fixes #40