Switch shonm/php-resque from fastcgi to master
Merge branch 'master' of git://github.com/ShonM/ResqueBundle

Conflicts:
	composer.lock