upstream fixes, simplified controller resolving#5

Open

digitalkaoz wants to merge 6 commits intofriends-of-reactphp:masterfrom digitalkaoz:upstream_fixes

+235-315

Commits on Oct 31, 2014

Commits on Dec 2, 2014