Remove user login block from sidebar, enable betterlogin, turn on the private site functionality
Add aegir_tour to makefile, and list potential 'golden' contrib.
Add bootstrap_tour.
Enable our tour by default.
Use git version of aegir_tour, pending a release.
Comment out aegir_tour download info, since make appears to need an XML feed for it.
Don't enable aegir_tour until we can download it properly.
Merge remote-tracking branch 'origin/7.x-3.x' into dev-helmo-3.x

Conflicts:
	drupal-org.make