Exposed AWS instance type, virtualization type, and ssh user through configuration [fixes #5]
Moved the diamond testing ahead of carbon testing in Travis