Rebase nelmio

## Background
Catching up our fork with upstream in preparation to add new functionality.

## PR Runs
### Alice
```
-*- mode: compilation; default-directory: "~/Desktop/src/ChessCom/chess/" -*-
Compilation started at Tue Apr 22 15:43:18

cd ~/Desktop/src/ChessCom/chess && vagrant ssh -c "bin/phpunit -c vendor/nelmio/alice/"
 
PHPUnit 3.7.34 by Sebastian Bergmann.

Configuration read from /www/sites/www.c.com/vendor-develop/nelmio/alice/phpunit.xml.dist

................................................................. 65 / 80 ( 81%)
...............

Time: 688 ms, Memory: 14.00Mb

OK (80 tests, 246 assertions)
Connection to 127.0.0.1 closed.

Compilation finished at Tue Apr 22 15:43:22
```

### Chess
```
-*- mode: compilation; default-directory: "~/Desktop/src/ChessCom/chess/" -*-
Compilation started at Tue Apr 22 15:44:40

cd ~/Desktop/src/ChessCom/chess && vagrant ssh -c "bin/c --memory=-1 pr"
 
Environment:  test
Started:      April 22 2014, 1:44 pm
Host:         PHP 5.3.19 on chessdev
Build:        pr => phantomjs, karma, param, memcache, redis, composer, bootstrap, cache, assets, database, fixtures, phpunit, behat, npm, karma, phantomjs, karma
Git:          origin-develop +0 (eff06ef 5 hours ago)

phantomjs::setUp() ✔
karma::setUp() ✔
param::run() ✔
memcache::run() ✔
redis::run(--flush-dbs=0,1) ✔
composer::run() ✔
bootstrap::run() ✔
cache::run(--no-warm --kernels=app,api) ✔
assets::run() ✔
database::run(--all) ✔
fixtures::run() ✔
phpunit::run(--no-fixtures) ✔
behat::run() ✔
npm::run() ✔
karma::run() ✔
phantomjs::tearDown() ✔
karma::tearDown() ✔
Connection to 127.0.0.1 closed.

Compilation finished at Tue Apr 22 15:52:31
```

/cc @ajessu