Modified local.conf to use ceilometer and requirements branch
Merge pull request #2 from adelina-t/master

Modified local.conf to use ceilometer and requirements branch