Merge pull request #5 from snowch/openstack-docker

Openstack docker
Merge remote-tracking branch 'origin/master' into openstack-docker