Make sync_wiki_export fail on first error
Update Vagrantfile to use 12.04
Update CFAR link
Merge branch 'master' into staging
Add missing </p> to upcomingmeetups.html
Update submodule paths
Merge branch 'master' into staging
Use /etc/init.d/paster for service restarts
Merge branch 'master' into staging
Revert "Use /etc/init.d/paster for service restarts"

This reverts commit e23f2bd6bcbb571307b1186c3dd0de7bfedcd879.
Merge branch 'master' into staging
Change everything for new server layout

[#75089952]
Merge branch 'master' into staging
Update provisioning and freebsd cookbook

Conflicts:
	Vagrantfile
Copy paster config from outside /etc/init
Merge branch 'master' into staging
Merge branch 'staging' into stable