Don't use invalid smokestack branch for ceilometer

I accidently left this branch switch in when moving back to upstream
Merge pull request #43 from ianw/ceilometer-branch

Don't use invalid smokestack branch for ceilometer