Redo of makefile. Build files no longer need to be modified for enterprise builds.

config/config.json

@@ -87,8 +87,8 @@
         "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
         "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
         "SendPushNotifications": false,
-        "PushNotificationContents": "generic",
-        "PushNotificationServer": ""
+        "PushNotificationServer": "",
+        "PushNotificationContents": "generic"
     },
     "RateLimitSettings": {
         "EnableRateLimiter": true,
@@ -146,4 +146,4 @@
         "Directory": "./data/",
         "EnableDaily": false
     }
-}
+}