diff --git a/source/_posts/2011-07-22-octopress-20-surfaces.markdown b/source/_posts/2011-07-22-octopress-20-surfaces.markdown
index 715b3ab..4802335 100644
--- a/source/_posts/2011-07-22-octopress-20-surfaces.markdown
+++ b/source/_posts/2011-07-22-octopress-20-surfaces.markdown
@@ -7,7 +7,7 @@ comments: true
 categories: release
 ---
 
-Octopress is a framework designed by [Brandon Mathis](http://brandonmathis.com) for [Jekyll](http://github.com/mojombo/jekyll), the blog aware static site generator powering Github Pages.
+Octopress is a framework designed by [Brandon Mathis](http://brandonmathis.com) for [Jekyll](http://github.com/mojombo/jekyll), the blog aware static site generator powering [Github Pages](http://pages.github.com).
 To start blogging with Jekyll, you have to write your own HTML templates, CSS, Javascripts and set up your configuration. But with Octopress
 All of that is already taken care of. Simply [clone or fork Octopress](https://github.com/imathis/octopress), install dependencies and the theme, and you're set.
 
diff --git a/source/docs/setup/index.markdown b/source/docs/setup/index.markdown
index 0ee8e85..37122fa 100644
--- a/source/docs/setup/index.markdown
+++ b/source/docs/setup/index.markdown
@@ -20,7 +20,8 @@ repository is named `your_username.github.com` or `your_organization.github.com`
     git push origin master
 ```
 
-Next, if you're using Github pages for users or organizations, create a source branch and push to origin source.
+Next, **if you're using [Github Pages](http://pages.github.com) to host a site for your user or organization**, create a source branch and push to origin source.
+If you're using Github project pages, or hosting the site in a different way, skip this step.
 
 ``` sh
     git checkout -b source
@@ -28,17 +29,16 @@ Next, if you're using Github pages for users or organizations, create a source b
 ```
 
 The `source` branch is created to have somewhere to store the source
-of your site. GitHub expects the generated site to be pushed to the
+for your site. GitHub user/organization pages expects the generated site to be pushed to the
 `master` branch of your GitHub repository so that branch needs to stay
-clean. As we will see later, in the [Deploying Octopress](/docs/deploying/)
-section, a "link" to the `master` branch will be created in the
-`_deploy` directory in which the generated site will end up.
+clean. In [Deploying Octopress](/docs/deploying/) we'll setup the `master` branch for deployment.
 
 Next, setup an [RVM](http://beginrescueend.com/) and install dependencies.
 
 ``` sh
     rvm rvmrc trust
     rvm reload
+    gem install bundler
     bundle install
 ```
 
@@ -50,7 +50,7 @@ Install the default Octopress theme,
 
 ### What to Commit?
 
-Now that you've installed the `source` and `sass` directories add them to your git repository, commit and push.
+With `rake install` you've setup the default Octopress theme in the `source` and `sass` directories. Add them to your git repository, commit and push. *Remember if you're hosting with Github user/organization pages, you'll want to commit these to the `source` branch.*
 
 ``` sh
     git add .