fixed packaging, updated munin configuration generation
Merge branch 'bskyb/staging' of https://github.com/nimbus-cloud/cf-release into bskyb/staging