Merge branch 'master' into ember-cli

Conflicts:
	assets/scripts/app/helpers/handlebars.coffee

assets/scripts/app/helpers/humanize-state.coffee

@@ -0,0 +1,10 @@
+safe = Travis.Helpers.safe
+
+fn = (state) ->
+  if state == 'received'
+    'booting'
+  else
+    state
+
+
+Travis.Handlebars.humanizeState = fn

assets/scripts/app/templates/build.hbs

@@ -6,7 +6,7 @@
     </div>
     <div class="right">
       <div class="build-status">
-        {{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}}
+        {{#link-to "build" repo build}}#{{build.number}} {{humanize-state build.state}}{{/link-to}}
       </div>
 
       <div class="runtime">

assets/scripts/app/templates/job.hbs

@@ -7,7 +7,7 @@
       </div>
       <div class="right">
         <div class="build-status">
-          {{#link-to "job" repo job}}#{{job.number}} {{job.state}}{{/link-to}}
+          {{#link-to "job" repo job}}#{{job.number}} {{humanize-state job.state}}{{/link-to}}
         </div>
 
         <div class="runtime">

assets/scripts/app/templates/top.hbs

@@ -8,6 +8,9 @@
   <li class="home">
     {{#link-to "main"}}Home{{/link-to}}
   </li>
+  {{#if config.pro}}
+    <li><a href="http://docs.travis-ci.com">Docs</a></li>
+  {{/if}}
   {{#if config.enterprise}}
     <li><a href="http://docs.travis-ci.com">Docs</a></li>
   {{else}}
@@ -53,10 +56,6 @@
   {{/if}}
 
   {{#unless config.pro}}
-    <li>
-      <a href="https://travisci.workable.com" class="werehiring" target="_blank">We're Hiring!</a>
-    </li>
-
     <li class="traviscicom">
       <a href="http://travis-ci.com">Travis CI for Private Repositories</a>
     </li>

assets/scripts/travis.coffee

@@ -128,6 +128,7 @@ require 'helpers/travis-field'
 require 'helpers/travis-field'
 require 'helpers/filter-input'
 require 'helpers/capitalize'
+require 'helpers/humanize-state'
 require 'helpers/github-commit-link'
 require 'helpers/format-time'
 require 'helpers/format-duration'
@@ -146,6 +147,7 @@ Ember.Handlebars.registerHelper('travis-field', Travis.Handlebars.travisField)
 Ember.Handlebars.registerHelper('filter-input', Travis.Handlebars.filterInput)
 
 Ember.Handlebars.registerBoundHelper('capitalize', Travis.Handlebars.capitalize)
+Ember.Handlebars.registerBoundHelper('humanize-state', Travis.Handlebars.humanizeState)
 Ember.Handlebars.registerBoundHelper('github-commit-link', Travis.Handlebars.githubCommitLink)
 Ember.Handlebars.registerBoundHelper('format-time', Travis.Handlebars.formatTime)
 Ember.Handlebars.registerBoundHelper('format-duration', Travis.Handlebars.formatDuration)