added storm-master
renamed storm-master -> storm_master
Merge branch 'supervisord' into storm-master
local ip
merge
Merge branch 'master' of https://github.com/slon1024/vagrant-cluster-storm into storm-master

Conflicts:
	provisionning/site.yml
defined role storm_master
Merge pull request #4 from slon1024/storm-master

Added role storm-master