NOTE: The plans page is still broken

- Change the subscribe method to allow for subscribing to the free plan, even when an org
- Change the frontend to no longer have different plan groups
- Change the frontend to display the proper plans (i.e. hide the deprecated plans unless it is the current plan, etc)

endpoints/api.py

@@ -1540,7 +1540,7 @@ def subscribe(user, plan, token, require_business_plan):
   if not plan_found:
     abort(404)
 
-  if require_business_plan and not plan_found['bus_features']:
+  if require_business_plan and not plan_found['bus_features'] and not plan_found['price'] == 0:
     abort(404)
 
   private_repos = model.get_private_repo_count(user.username)
@@ -1679,7 +1679,7 @@ def get_org_subscription(orgname):
         return jsonify(subscription_view(cus.subscription, private_repos))
 
     return jsonify({
-      'plan': 'bus-free',
+      'plan': 'free',
       'usedPrivateRepos': private_repos,
     })