Revert "revert all next branches to master after initial next merge"

This reverts commit 903ef24f20ab4b57072f6807937196606c72e644.
bootstrap: fix mac bootstrap
nagios: reduce hipchat messages to one line
homebrew: use official repo
beanstalkd: do not start service on mac
portage: remove porticron
mongodb: remove old logrotate config if instance is not deployed
base: fix some mac bootstrapping issues
mac: remove duplicate resource
update production environment
metro: version bump
Merge branch 'next'
Revert "Revert "revert all next branches to master after initial next merge""

This reverts commit baa9ab2505a6a8c978972f6e5311b20fe7bda07b.