delete tb conf .rd
Merge branch 'refs/heads/develop' into feature/STOMPlets

Conflicts:
	config/torquebox.rb
	config/torquebox.yml