merge master into scale brochure

diff --cc artwork/brochure/brochure_debian-neurodebian.tex
index e3ca10df7f54e9d0973b1dfc465fb14dc05043d0,d192799ec361acd440f79cf804a0fac18424b56c..4a2852dfd0660ce13968b357dd8f2891f36929d2
--- 1/artwork/brochure/brochure_debian-neurodebian.tex
--- 2/artwork/brochure/brochure_debian-neurodebian.tex
+++ b/artwork/brochure/brochure_debian-neurodebian.tex
@@@ -231,8 -231,9 +231,9 @@@ teams, such as Debian-Science or Debian
  \begin{description}[nolistsep,leftmargin=1pc,style=nextline]
  \item[Install on a hard-drive] \url{http://www.debian.org/distrib/}
  \item[Live CD/DVD] \url{http://www.debian.org/CD/live/}
 -\item[Run in a Virtual Machine] \url{http://neuro.debian.net/vm.html}
 +%\item[Run in a Virtual Machine] \url{http://neuro.debian.net/vm.html}
  \item[Development version] \url{http://www.debian.org/devel/debian-installer}
+ \item[Use in a cloud] \url{https://wiki.debian.org/Cloud}
  \end{description}
  
  % \ndsubsection{Get \emph{Testing/Unstable} Debian}