Added amazonaws check
simplified include of machine specific files