Merge pull request #21 from jfwood/master

Fix auto-db config logic;
Increase the worker threadpool to 1000
Merge pull request #22 from dstufft/increase-worker-threadpool

Increase the worker threadpool to 1000
Update metadata.rb
Add enable-threads and single-interpreter options

Both enable-threads and single-interpreter options are required by
the newrelic application monitoring agent. This PR makes them
configurable in the vassal configuration.
Merge pull request #23 from dmend/master

Add enable-threads and single-interpreter options
Update Barbican Paste file to include new version app
Merge remote-tracking branch 'upstream/master'

Conflicts:
	metadata.rb
Merge pull request #26 from chadlung/master

Update Barbican Paste file to include new version app
Add new task retry config parameters to the barbican config file template and defaults