Cleaned up templates a bit. Get rid of deprecation warnings on puppet 3