Merge pull request #1522 from tamtamchik/patch-1

Update Setup.md

doc/developer/Setup.md

@@ -11,7 +11,10 @@ Developer Machine Setup
 		`docker-machine ip dev`
 	3. Add a line to your /etc/hosts that goes `<Docker IP> dockerhost`
 	4. Run `docker-machine env dev` and copy the export statements to your ~/.bash_profile
-2. Download Go 1.5.1 from http://golang.org/dl/
+2. Download Go 1.5.1 and Node.js using Homebrew
+	1. Download Homebrew from http://brew.sh/
+	2. `brew install go`
+	3. `brew install node`
 3. Set up your Go workspace
 	1. `mkdir ~/go`
 	2. Add the following to your ~/.bash_profile  
@@ -21,20 +24,17 @@ Developer Machine Setup
 		If you don't increase the file handle limit you may see some weird build issues with browserify or npm.  
 	3. Reload your bash profile  
 		`source ~/.bash_profile`
-4. Install Node.js using Homebrew
+4. Install Compass
-	1. Download Homebrew from http://brew.sh/
-	2. `brew install node`
-5. Install Compass
 	1. Run `ruby -v` and check the ruby version is 1.8.7 or higher
 	2. `sudo gem install compass`
-6. Download Mattermost  
+5. Download Mattermost  
 	`cd ~/go`  
 	`mkdir -p src/github.com/mattermost`  
 	`cd src/github.com/mattermost`  
 	`git clone https://github.com/mattermost/platform.git`  
 	`cd platform`
-7. Run unit tests on Mattermost using `make test` to make sure the installation was successful
+6. Run unit tests on Mattermost using `make test` to make sure the installation was successful
-8. If tests passed, you can now run Mattermost using `make run`
+7. If tests passed, you can now run Mattermost using `make run`
 
 Any issues? Please let us know on our forums at: http://forum.mattermost.org
 
@@ -64,13 +64,9 @@ Any issues? Please let us know on our forums at: http://forum.mattermost.org
 		If you don't increase the file handle limit you may see some weird build issues with browserify or npm.  
 	3. Reload your bashrc  
 		`source ~/.bashrc`
-6. Install Node.js
+6. Install Node.js  
-	1. Download the newest version of the Node.js sources from https://nodejs.org/en/download/
+	`curl -sL https://deb.nodesource.com/setup_5.x | sudo -E bash -`  
-	2. Extract the contents of the package and cd into the extracted files
+	`sudo apt-get install -y nodejs`
-	3. Compile and install Node.js  
-		`./configure`  
-		`make`  
-		`make install`
 7. Install Ruby and Compass  
 	`apt-get install ruby`  
 	`apt-get install ruby-dev`