Merge remote-tracking branch 'origin/master' into edit-update
Merge branch 'edit-update' of github.com:hdb3/openstack-scripts into edit-update
add .gitignore