fix: m2.2xlarge instances have only one 850GB ephemeral drive. (JIRA IT-111)

Squashed commit of the following:

commit bf433d32b5cff0f388d04499dd74fbf7eb5b6d29
Author: Chris Howe <howech@infochimps.com>
Date:   Tue Apr 15 10:35:55 2014 -0500

    m2.2xlarge instances have only one 850GB ephemeral drive

    Change-Id: Ie8b40d1c61f1fbe06c1df5bd44a1a3ba8282fa51

Change-Id: Ic4b40938d202c51442d245d4cd2ce4a4123bc142
Merge "fix: m2.2xlarge instances have only one 850GB ephemeral drive. (JIRA IT-111)"