Clean up location.

source/about/index.html.md

@@ -3,6 +3,9 @@ layout: markdown_page
 title: About Us
 ---
+- TOC
+{:toc}
+
 ## GitLab Inc.
 GitLab Inc. is a company based on the [GitLab open-source project](https://gitlab.com/gitlab-org/gitlab-ce/).
@@ -105,7 +108,8 @@ We promise that:
 ### What features are EE only
-When we make new features we ask ourselves, is this feature **more relevant for organizations that have more than 100 potential users**?
+If the wider community contributes a new feature they get to choose if it goes into CE or EE by sending the merge request to the repository they prefer (most go to CE). If the wider community contributes a feature already in EE to CE we use the process linked in [Contributing an EE only feature to CE
+](#contributing-an-ee-only-feature-to-ce). When GitLab Inc. makes a new features we ask ourselves, is this feature **more relevant for organizations that have more than 100 potential users**?
 If the answer is yes the feature is likely to be exclusive to EE.
 There are no features that are only useful to larger organizations, so for every EE features there will be smaller organizations that also need it. We're not saying that there are no small organizations that need the EE feature, just that we think that larger organizations are more likely to need it.
@@ -178,17 +182,12 @@ If you have time to give please help spread the word about GitLab by mentioning
 If you would like to give money please <a href="http://railsgirlssummerofcode.org/campaign/">donate to Rails Girls Summer of Code</a> in our name.
 ## Location
-GitLab is a community project with people participating from all over the world.
-GitLab Inc. has people in three continents to serve our customers better.
-Most of our customers are in the United States.
-
-Most of our team is distributed. We're proud to be [working remotely](https://about.gitlab.com/2014/07/03/how-gitlab-works-remotely/),
-using GitLab Issues to coordinate. We have a [Remote Manifesto](https://about.gitlab.com/2015/04/08/the-remote-manifesto/),
-our team members have shared their [experiences](https://about.gitlab.com/2015/06/17/highlights-to-my-first-remote-job/)
-in our blog and did a Q&A for [Remote.co](https://remote.co/company/gitlab/). You can taste a bit of the GitLab team culture by visiting
+GitLab is an open source project with [more than 1500 people](http://contributors.gitlab.com/) contributing from all over the world.
+GitLab Inc. has people in [more than 35 countries](https://about.gitlab.com/team/).
+We're proud to be [remote only](http://www.remoteonly.org/).
+You can taste a bit of the GitLab team culture by visiting
 our <a href="https://about.gitlab.com/culture/">culture page</a>.
-
 [This commit]: https://gitlab.com/gitlab-org/gitlab-ce/commit/0f43e98ef8c2da8908b1107f75b67cda2572c2c4
 [first version of GitLab CI]: https://gitlab.com/gitlab-org/gitlab-ci/commit/52cd500ee64a4a82b9ff6752ee85028cd419fcbe
 [GitLab Enterprise Edition]: https://about.gitlab.com/2013/08/22/introducing-gitlab-6-0-enterprise-edition/