Merge branch 'master' into booting-state

app/controllers/settings.coffee

@@ -10,9 +10,9 @@ SettingsController = Ember.Controller.extend
     sshKeyDeleted: ->
       @set('model.customSshKey', null)
 
-    deactivate: ->
-      console.log('deactivate')
-      debugger
+    # deactivate: ->
+    #   console.log('deactivate')
+    #   debugger
     
 
 `export default SettingsController`

app/templates/components/limit-concurrent-builds.hbs

@@ -1,6 +1,6 @@
 {{travis-switch active=enabled description=description action="toggle"}}
 <div class="tooltip--settings">
-  <a href="http://blog.travis-ci.com/2014-07-18-per-repository-concurrency-setting/" title="about the concurrency setting">
+  <a href="http://docs.travis-ci.com/user/customizing-the-build/#Limiting-Concurrent-Builds" title="about the concurrency setting">
     <p class="tooltip-bubble">Read more about<br>concurrent builds</p>
     <span class="icon icon--question"></span>
   </a>