pip for default centos install
storm, daemontools
Merge branch 'development'

Conflicts:
	top.sls
Merge branch 'development'
Didn't place the right file.
Merge branch 'master' into development