Allow usage with docker 1.3.2
Merge pull request #111 from travis-ci/db-docker132

Allow usage with docker 1.3.x
Ensure a reasonable template is selected

In the event of a BB block template rename, it is possible that
a job waiting for a VM to go into an infinite template selection
loop where #create_server throws a NoMethodError.
Revert "Ensure a reasonable template is selected"

This reverts commit 307b50449152434c909a3d6d2d5bca42684ee387.

It's not ready for master yet.
increase the vm boot timeout for bluebox

as requested by bluebox