Merge branch 'master' into pr/423

# Conflicts:
#	docs/gitbook/Basics/Options.md

docs/gitbook/Basics/Localization.md

@@ -12,20 +12,32 @@ The `dir` attribute accepts the same values as the [HTML spec](https://developer
 
 All of the text within the component has been wrapped within [slots](https://vuejs.org/v2/guide/components.html#Content-Distribution-with-Slots) and can be replaced in your app.
 
-
 ##### Loading Spinner
-
+*Slot Definition:*
 ```html
 <slot name="spinner">
 	<div class="spinner" v-show="mutableLoading">Loading...</div>
 </slot>
 ```
+*Implementation:*
+```html
+<v-select>
+	<i slot="spinner" class="icon icon-spinner"></i>
+</v-select>
+```
 
 ##### No Options Text
-
+*Slot Definition:*
 ```html
 <slot name="no-options">Sorry, no matching options.</slot>
 ```
+*Implementation:*
+```html
+<v-select>
+	<span slot="no-options">No Options Here!</div>
+</v-select>
+```
+
 For a full list of component slots, view the [slots API docs](Api/Slots.md).
 
 [](codepen://sagalbot/oZmLVN?height=250)

docs/gitbook/Basics/Options.md

@@ -54,6 +54,6 @@ If you wanted to return `CA` in the dropdown when `Canada` is selected, you'd us
 ```
 
 
-### Null / Empty Options {#emptyOptions}
+### Null / Empty Options {#null}
 
 `vue-select` requires the `option` property to be an `array`. If you are using Vue in development mode, you will get warnings attempting to pass anything other than an `array` to the `options` prop. If you need a `null`/`empty` value, use an empty array `[]`.

docs/gitbook/Basics/Values.md

@@ -35,4 +35,4 @@ If you want new tags to be pushed to the options list, set `push-tags` to true.
 <v-select taggable></v-select>
 ```
 
-[](codepen://sagalbot/NpwrQO?height=250)
+[](codepen://sagalbot/XVoWxm?height=350)