Merge branch '1.1'

Conflicts:
	composer.lock

.php_cs

@@ -1,92 +0,0 @@
-<?php
-
-$header = <<<EOF
-This file is part of Cachet.
-
-(c) Alt Three Services Limited
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-EOF;
-
-Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
-
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::NONE_LEVEL)
-    ->fixers(array(
-        'header_comment',
-        'psr0',
-        'encoding',
-        'short_tag',
-        'braces',
-        'elseif',
-        'eof_ending',
-        'function_call_space',
-        'function_declaration',
-        'indentation',
-        'line_after_namespace',
-        'linefeed',
-        'lowercase_constants',
-        'lowercase_keywords',
-        'method_argument_space',
-        'multiple_use',
-        'parenthesis',
-        'php_closing_tag',
-        'single_line_after_imports',
-        'trailing_spaces',
-        'visibility',
-        'blankline_after_open_tag',
-        'concat_without_spaces',
-        'double_arrow_multiline_whitespaces',
-        'duplicate_semicolon',
-        'empty_return',
-        'extra_empty_lines',
-        'include',
-        'join_function',
-        'list_commas',
-        'multiline_array_trailing_comma',
-        'namespace_no_leading_whitespace',
-        'new_with_braces',
-        'no_blank_lines_after_class_opening',
-        'no_empty_lines_after_phpdocs',
-        'object_operator',
-        'operators_spaces',
-        'phpdoc_indent',
-        'phpdoc_no_access',
-        'phpdoc_no_package',
-        'phpdoc_params',
-        'phpdoc_scalar',
-        'phpdoc_separation',
-        'phpdoc_short_description',
-        'phpdoc_to_comment',
-        'phpdoc_trim',
-        'phpdoc_type_to_var',
-        'phpdoc_var_without_name',
-        'remove_leading_slash_use',
-        'remove_lines_between_uses',
-        'return',
-        'self_accessor',
-        'single_array_no_trailing_comma',
-        'single_blank_line_before_namespace',
-        'single_quote',
-        'spaces_before_semicolon',
-        'spaces_cast',
-        'standardize_not_equal',
-        'ternary_spaces',
-        'trim_array_spaces',
-        'unalign_equals',
-        'unary_operators_spaces',
-        'unused_use',
-        'whitespacy_lines',
-        'align_double_arrow',
-        'multiline_spaces_before_semicolon',
-        'ordered_use',
-        'phpdoc_order',
-        'short_array_syntax',
-    ))
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
-            ->exclude('Symfony/CS/Tests/Fixtures')
-            ->in(__DIR__)
-    )
-;

composer.lock

@@ -1128,16 +1128,16 @@
         },
         {
             "name": "graham-campbell/throttle",
-            "version": "v4.1.0",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Laravel-Throttle.git",
-                "reference": "d708acbea68a560c66fcd4657dba1a42f4b3ce9d"
+                "reference": "35ca0b1e90f7eaf20251cc6005b93462413e2858"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Throttle/zipball/d708acbea68a560c66fcd4657dba1a42f4b3ce9d",
-                "reference": "d708acbea68a560c66fcd4657dba1a42f4b3ce9d",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Throttle/zipball/35ca0b1e90f7eaf20251cc6005b93462413e2858",
+                "reference": "35ca0b1e90f7eaf20251cc6005b93462413e2858",
                 "shasum": ""
             },
             "require": {
@@ -1185,7 +1185,7 @@
                 "throttle",
                 "throttling"
             ],
-            "time": "2015-06-26 17:35:00"
+            "time": "2015-08-03 13:40:11"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -1543,7 +1543,7 @@
                     "name": "Jeremy Lindblom",
                     "email": "jeremeamia@gmail.com",
                     "homepage": "https://github.com/jeremeamia",
-                    "role": "Developer"
+                    "role": "developer"
                 }
             ],
             "description": "Serialize Closure objects, including their context and binding",
@@ -4075,16 +4075,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "1.3.1",
+            "version": "1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "3e39374f4c9ec3757839e2952e7a68ac28941760"
+                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3e39374f4c9ec3757839e2952e7a68ac28941760",
-                "reference": "3e39374f4c9ec3757839e2952e7a68ac28941760",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
+                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
                 "shasum": ""
             },
             "require": {
@@ -4121,7 +4121,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2015-08-02 04:41:00"
+            "time": "2015-08-03 06:14:51"
         },
         {
             "name": "sebastian/exporter",