Configuration fixes'
Merge branch 'master' of https://github.com/buddycloud/buddycloud-package