in flight
Merge branch 'master' of github.com:coreos/coreos-rackspace-rescue-scripts

Conflicts:
	fabfile.py
update for new parition layout