Merge remote-tracking branch 'origin/2.1'

Conflicts:
	.travis.yml
	CHANGELOG.md

Author: GrahamCampbell

.travis.yml

@@ -14,8 +14,6 @@ install:
 script:
   - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then vendor/bin/phpunit; fi;'
   - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi;'
-  - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpcs src -p --standard=psr2 --ignore=*.blade.php; fi;'
-  - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/php-cs-fixer --diff --dry-run -vv fix; fi;'
 
 after_script:
   - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi;'

CHANGELOG.md

@@ -7,6 +7,11 @@ CHANGE LOG
 * Upgraded to laravel 5
 
 
+## V2.1.4 Alpha (Upcoming)
+
+* Removed the cs fixers
+
+
 ## V2.1.3 (05/10/2014)
 
 * Improved the test suite