minor edits
Merge branch 'master' of https://github.com/johnfitzpatrick/openstack-scratch

Conflicts:
	.DS_Store
Minor edits