Remove beanstalkd exceptions
Throw exception when invalid queue type is given
Fix conflicts