Merge branch '1.1'

Conflicts:
	composer.json
	composer.lock
	config/emoji.php

composer.lock

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "alt-three/emoji",
-            "version": "dev-master",
+            "version": "v1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AltThree/Emoji.git",
-                "reference": "f087472401a522a4c516ebaefbf9de6c400d90c7"
+                "reference": "cbd5b86fa71a3332eae9d06345d7efc9c1fada17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AltThree/Emoji/zipball/f087472401a522a4c516ebaefbf9de6c400d90c7",
-                "reference": "f087472401a522a4c516ebaefbf9de6c400d90c7",
+                "url": "https://api.github.com/repos/AltThree/Emoji/zipball/cbd5b86fa71a3332eae9d06345d7efc9c1fada17",
+                "reference": "cbd5b86fa71a3332eae9d06345d7efc9c1fada17",
                 "shasum": ""
             },
             "require": {
@@ -65,7 +65,7 @@
                 "emoji",
                 "parser"
             ],
-            "time": "2015-08-06 17:39:50"
+            "time": "2015-08-06 18:42:28"
         },
         {
             "name": "alt-three/validator",

config/emoji.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of Alt Three Emoji.
+ * This file is part of Cachet.
  *
  * (c) Alt Three Services Limited
  *
@@ -16,7 +16,8 @@ return [
     | GitHub Token
     |--------------------------------------------------------------------------
     |
-    | Configure a GitHub token here to decrease the rate limit.
+    | Here you may get us to use your personal github access token to increase
+    | your rate limit while contacting GitHub's API.
     |
     */
 

package.json

@@ -2,7 +2,7 @@
     "dependencies": {
         "bower": "~1.4.1",
         "gulp": "~3.9.0",
-        "laravel-elixir": "~3.0.3",
+        "laravel-elixir": "~3.1.1",
         "laravel-elixir-jshint": "~0.1.7"
     },
     "private": true

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
-  "dist/css/all.css": "dist/css/all-5dfb9a8868.css",
+  "dist/css/all.css": "dist/css/all-d21a7e545f.css",
   "dist/js/all.js": "dist/js/all-d557ec2d69.js"
 }