Test against PHP 5.6 & hhvm
Merge pull request #3 from dave1010/patch-1

Test against PHP 5.6 & hhvm
Fix composer dependencies that got moved around
Merge pull request #4 from dave1010/hotfix/composer-dependencies

Fix composer dependencies that got moved around
upstream fixes, simplified controller resolving