torquebox service running on Ubuntu 12.04
Merge conflicting repos