Merge branch 'master' of github.com:lord/slate

# Conflicts:
#	README.md
#	config.rb
#	source/includes/main.md

.github/ISSUE_TEMPLATE.md

+If this is a question or feature request, make sure to:
+
+- [ ] The title starts with `Question:` or `Feature:`.
+
+If this is an bug report, not a question, make sure to:
+
+- [ ] I'm not running Windows (which is unsupported), or if I am, I can confirm this issue appears on another platform, or Vagrant.
+- [ ] This issue appears in the latest `dev` branch.
+- [ ] I've included my browser and Ruby version in this issue.

.github/PULL_REQUEST_TEMPLATE.md

+Make sure you've checked off all these things before submitting:
+
+- [ ] This pull request isn't for a company's fork, it's intended for the upstream Slate shared by everybody.
+- [ ] This pull request is submitted to the `dev` branch.
+- [ ] If it makes frontend changes, this pull request has been tested in the latest version of Firefox, Chrome, IE, and Safari.

CHANGELOG.md

 # Changelog
 
+## Version 1.3.3
+
+*June 11, 2016*
+
+Documentation and example changes.
+
 ## Version 1.3.2
 
 *February 3, 2016*

README.md

@@ -2,13 +2,13 @@
   <img src="https://raw.githubusercontent.com/lord/img/master/logo-slate.png" alt="Slate: API Documentation Generator" width="226">
 </p>
 
-<p align="center"><i>A Node.js port of <a href="https://github.com/tripit/slate">tripit/slate</a></i></p>
+<p align="center"><i>A Node.js port of <a href="https://github.com/lord/slate">lord/slate</a></i></p>
 
 <p align="center">Slate helps you create beautiful, intelligent, responsive API documentation.</p>
 
 <p align="center"><img src="https://dl.dropboxusercontent.com/u/95847291/github%20images/slate/slate_screenshot_new.png" width=700 alt="Screenshot of Example Documentation created with Slate"></p>
 
-<p align="center"><em>The example above was created with Slate. Check it out at <a href="https://tripit.github.io/slate">tripit.github.io/slate</a>.</em></p>
+<p align="center"><em>The example above was created with Slate. Check it out at <a href="https://lord.github.io/slate">lord.github.io/slate</a>.</em></p>
 
 Features
 ------------
@@ -27,9 +27,7 @@ Features
 
 * **Let your users update your documentation for you** — By default, your Slate-generated documentation is hosted in a public Github repository. Not only does this mean you get free hosting for your docs with Github Pages, but it also makes it simple for other developers to make pull requests to your docs if they find typos or other problems. Of course, if you don't want to use GitHub, you're also welcome to host your docs elsewhere.
 
-Getting started with Slate is super easy! Simply fork this repository and follow the instructions below. Or, if you'd like to check out what Slate is capable of, take a look at the [sample docs](http://tripit.github.io/slate).
-
-<!--As an example, you can check out the [TripIt API docs](http://tripit.github.io/api), which we create with Slate. You can also view the source of the [markdown file used to generate it](http://github.com/tripit/api/blob/master/source/index.md).-->
+Getting started with Slate is super easy! Simply fork this repository and follow the instructions below. Or, if you'd like to check out what Slate is capable of, take a look at the [sample docs](http://lord.github.io/slate).
 
 Getting Started with Slate
 ------------------------------

source/includes/main.md

@@ -28,6 +28,12 @@ curl "api_endpoint_here"
   -H "Authorization: meowmeowmeow"
 ```
 
+```javascript
+const kittn = require('kittn');
+
+let api = kittn.authorize('meowmeowmeow');
+```
+
 > Make sure to replace `meowmeowmeow` with your API key.
 
 Kittn uses API keys to allow access to the API. You can register a new Kittn API key at our [developer portal](http://example.com/developers).
@@ -63,6 +69,13 @@ curl "http://example.com/api/kittens"
   -H "Authorization: meowmeowmeow"
 ```
 
+```javascript
+const kittn = require('kittn');
+
+let api = kittn.authorize('meowmeowmeow');
+let kittens = api.kittens.get();
+```
+
 > The above command returns JSON structured like this:
 
 ```json
@@ -122,6 +135,13 @@ curl "http://example.com/api/kittens/2"
   -H "Authorization: meowmeowmeow"
 ```
 
+```javascript
+const kittn = require('kittn');
+
+let api = kittn.authorize('meowmeowmeow');
+let max = api.kittens.get(2);
+```
+
 > The above command returns JSON structured like this:
 
 ```json

source/index.yml

@@ -4,6 +4,7 @@ language_tabs:
   - bash
   - ruby
   - python
+  - javascript
 
 toc_footers:
   - <a href='#'>Sign Up for a Developer Key</a>