retire quetzal, bring in tahr, change instance types on 64-bit machines.
fixing one incorrect instance type.
Merge pull request #1762 from kmarsteller/testhosts

Testhosts