convert all spaces to tabs, lets see what breaks

Signed-off-by: Jessica Frazelle <princess@docker.com>
diff --git a/afterthedeadline/Dockerfile b/afterthedeadline/Dockerfile
index 9c747b4..b62b41f 100644
--- a/afterthedeadline/Dockerfile
+++ b/afterthedeadline/Dockerfile
@@ -4,18 +4,18 @@
 EXPOSE 1049
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    openjdk-6-jre \
-    --no-install-recommends \ 
-    && rm -rf /var/lib/apt/lists/*
+	ca-certificates \
+	curl \
+	openjdk-6-jre \
+	--no-install-recommends \ 
+	&& rm -rf /var/lib/apt/lists/*
 
 ENV LANG C.UTF-8
 
 RUN curl -sSL "http://www.polishmywriting.com/download/atd_distribution081310.tgz" -o /tmp/atd.tar.gz \
-    && mkdir -p /usr/src/atd \
-    && tar -xzf /tmp/atd.tar.gz -C /usr/src/atd --strip-components 1 \
-    && rm /tmp/atd.tar.gz* 
+	&& mkdir -p /usr/src/atd \
+	&& tar -xzf /tmp/atd.tar.gz -C /usr/src/atd --strip-components 1 \
+	&& rm /tmp/atd.tar.gz* 
 
 WORKDIR /usr/src/atd
 
diff --git a/atom/Dockerfile b/atom/Dockerfile
index 7e48732..1d48b9c 100644
--- a/atom/Dockerfile
+++ b/atom/Dockerfile
@@ -1,22 +1,22 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create the atom editor in a container 
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Create the atom editor in a container 
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build the atom editor 
-#   in a container with all dependencies installed.
-#   Note: atom is not a node-webkit app,
-#   found this out a little too late into this example
-#   it uses atom-shell(https://github.com/atom/atom-shell)
-#   Tested on Debian Jessie.
+#	This file describes how to build the atom editor 
+#	in a container with all dependencies installed.
+#	Note: atom is not a node-webkit app,
+#	found this out a little too late into this example
+#	it uses atom-shell(https://github.com/atom/atom-shell)
+#	Tested on Debian Jessie.
 # USAGE:
-#   # Download atom Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/atom/Dockerfile
+#	# Download atom Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/atom/Dockerfile
 #
-#   # Build atom image
-#   docker build -t atom .
+#	# Build atom image
+#	docker build -t atom .
 #
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -e DISPLAY=unix$DISPLAY atom
+#	docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
+#	  -e DISPLAY=unix$DISPLAY atom
 #
 
 # Base docker image
@@ -25,17 +25,17 @@
 
 # Install dependencies
 RUN apt-get update && apt-get install -y \
-    build-essential \
-    ca-certificates \
-    curl \
-    git \
-    libasound2 \
-    libgconf-2-4 \
-    libgnome-keyring-dev \
-    libgtk2.0-0 \
-    libnss3 \
-    libxtst6 \
-    --no-install-recommends
+	build-essential \
+	ca-certificates \
+	curl \
+	git \
+	libasound2 \
+	libgconf-2-4 \
+	libgnome-keyring-dev \
+	libgtk2.0-0 \
+	libnss3 \
+	libxtst6 \
+	--no-install-recommends
 
 # install node
 RUN curl -sL https://deb.nodesource.com/setup | bash -
diff --git a/cathode/Dockerfile b/cathode/Dockerfile
index d0e05c3..9963e28 100644
--- a/cathode/Dockerfile
+++ b/cathode/Dockerfile
@@ -2,23 +2,23 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    build-essential \
-    ca-certificates \
-    git \
-    qmlscene \
-    qt5-qmake \
-    qt5-default \
-    qtdeclarative5-dev \
-    qml-module-qtquick-controls \
-    qml-module-qtgraphicaleffects \
-    qml-module-qtquick-dialogs \
-    qml-module-qtquick-localstorage \
-    qml-module-qtquick-window2 \
-    --no-install-recommends
+	build-essential \
+	ca-certificates \
+	git \
+	qmlscene \
+	qt5-qmake \
+	qt5-default \
+	qtdeclarative5-dev \
+	qml-module-qtquick-controls \
+	qml-module-qtgraphicaleffects \
+	qml-module-qtquick-dialogs \
+	qml-module-qtquick-localstorage \
+	qml-module-qtquick-window2 \
+	--no-install-recommends
 
 RUN git clone --recursive https://github.com/Swordfish90/cool-retro-term.git /src
 WORKDIR /src
 RUN qmake \
-    && make
+	&& make
 
 ENTRYPOINT [ "/src/cool-retro-term" ]
diff --git a/chrome/Dockerfile b/chrome/Dockerfile
index 4c43c38..073ce06 100644
--- a/chrome/Dockerfile
+++ b/chrome/Dockerfile
@@ -8,34 +8,34 @@
 
 # Install Chromium
 RUN sed -i.bak 's/sid main/sid main contrib non-free/g' /etc/apt/sources.list && \
-    mkdir -p /usr/share/icons/hicolor && \
-    apt-get update && apt-get install -y \
-    ca-certificates \
-    gconf-service \
-    hicolor-icon-theme \
-    libappindicator1 \
-    libasound2 \
-    libcanberra-gtk-module \
-    libcurl3 \
-    libexif-dev \
-    libgconf-2-4 \
-    libgl1-mesa-dri \
-    libgl1-mesa-glx \
-    libnspr4 \
-    libnss3 \
-    libpango1.0-0 \
-    libv4l-0 \
-    libxss1 \
-    libxtst6 \
-    wget \
-    xdg-utils \
-    --no-install-recommends && \
-    dpkg -i '/src/google-chrome-stable_current_amd64.deb' && \
-    apt-get install -y \
-    pepperflashplugin-nonfree \
-    --no-install-recommends && \
-    dpkg -i '/src/google-talkplugin_current_amd64.deb' \
-    && rm -rf /var/lib/apt/lists/*
+	mkdir -p /usr/share/icons/hicolor && \
+	apt-get update && apt-get install -y \
+	ca-certificates \
+	gconf-service \
+	hicolor-icon-theme \
+	libappindicator1 \
+	libasound2 \
+	libcanberra-gtk-module \
+	libcurl3 \
+	libexif-dev \
+	libgconf-2-4 \
+	libgl1-mesa-dri \
+	libgl1-mesa-glx \
+	libnspr4 \
+	libnss3 \
+	libpango1.0-0 \
+	libv4l-0 \
+	libxss1 \
+	libxtst6 \
+	wget \
+	xdg-utils \
+	--no-install-recommends && \
+	dpkg -i '/src/google-chrome-stable_current_amd64.deb' && \
+	apt-get install -y \
+	pepperflashplugin-nonfree \
+	--no-install-recommends && \
+	dpkg -i '/src/google-talkplugin_current_amd64.deb' \
+	&& rm -rf /var/lib/apt/lists/*
 
 COPY local.conf /etc/fonts/local.conf
 
diff --git a/chromium/Dockerfile b/chromium/Dockerfile
index 169673b..65e3f9f 100644
--- a/chromium/Dockerfile
+++ b/chromium/Dockerfile
@@ -1,24 +1,24 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create chromium container with its dependencies
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Create chromium container with its dependencies
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build a Chromium container with all
-#   dependencies installed. It uses native X11 unix socket.
-#   Tested on Debian Jessie
+#	This file describes how to build a Chromium container with all
+#	dependencies installed. It uses native X11 unix socket.
+#	Tested on Debian Jessie
 # USAGE:
-#   # Download Chromium Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/chromium/Dockerfile
+#	# Download Chromium Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/chromium/Dockerfile
 #
-#   # Build chromium image
-#   docker build -t chromium .
+#	# Build chromium image
+#	docker build -t chromium .
 #
-#   # Run stateful data-on-host chromium. For ephemeral, remove -v /data/chromium:/data
-#   docker run -v /data/chromium:/data -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY chromium
+#	# Run stateful data-on-host chromium. For ephemeral, remove -v /data/chromium:/data
+#	docker run -v /data/chromium:/data -v /tmp/.X11-unix:/tmp/.X11-unix \
+#	-e DISPLAY=unix$DISPLAY chromium
 
-#   # To run stateful dockerized data containers
-#   docker run --volumes-from chromium-data -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY chromium
+#	# To run stateful dockerized data containers
+#	docker run --volumes-from chromium-data -v /tmp/.X11-unix:/tmp/.X11-unix \
+#	-e DISPLAY=unix$DISPLAY chromium
 
 # Base docker image
 FROM debian:jessie
@@ -27,18 +27,18 @@
 COPY google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb
 # Install Chromium
 RUN sed -i.bak 's/jessie main/jessie main contrib non-free/g' /etc/apt/sources.list && \
-    apt-get update && apt-get install -y \
-    chromium \
-    chromium-l10n \
-    libcanberra-gtk-module \
-    libexif-dev \
-    libpango1.0-0 \
-    libv4l-0 \
-    pepperflashplugin-nonfree \
-    --no-install-recommends && \
-    mkdir -p /etc/chromium.d/ && \
-    /bin/echo -e 'export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"\nexport GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"\nexport GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"' > /etc/chromium.d/googleapikeys && \
-    dpkg -i '/src/google-talkplugin_current_amd64.deb'
+	apt-get update && apt-get install -y \
+	chromium \
+	chromium-l10n \
+	libcanberra-gtk-module \
+	libexif-dev \
+	libpango1.0-0 \
+	libv4l-0 \
+	pepperflashplugin-nonfree \
+	--no-install-recommends && \
+	mkdir -p /etc/chromium.d/ && \
+	/bin/echo -e 'export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"\nexport GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"\nexport GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"' > /etc/chromium.d/googleapikeys && \
+	dpkg -i '/src/google-talkplugin_current_amd64.deb'
 
 # Autorun x11vnc
 CMD ["/usr/bin/chromium", "--no-sandbox", "--user-data-dir=/data"]
diff --git a/consul-alerts/Dockerfile b/consul-alerts/Dockerfile
index 1678ca6..3bfac5e 100644
--- a/consul-alerts/Dockerfile
+++ b/consul-alerts/Dockerfile
@@ -8,12 +8,12 @@
 ADD https://jesss.s3.amazonaws.com/binaries/curl-unix-socket /usr/local/bin/curl-unix-socket
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    --no-install-recommends \
-    && mkdir -p /etc/consul.d/ \
-    && chmod +x /usr/local/bin/consul \
-    && chmod +x /usr/local/bin/curl-unix-socket \
-    && chmod +x /usr/local/bin/consul-alerts
+	ca-certificates \
+	curl \
+	--no-install-recommends \
+	&& mkdir -p /etc/consul.d/ \
+	&& chmod +x /usr/local/bin/consul \
+	&& chmod +x /usr/local/bin/curl-unix-socket \
+	&& chmod +x /usr/local/bin/consul-alerts
 
 ENTRYPOINT [ "/usr/local/bin/consul-alerts", "start" ]
diff --git a/consul/Dockerfile b/consul/Dockerfile
index bb0e31e..21ee5bc 100644
--- a/consul/Dockerfile
+++ b/consul/Dockerfile
@@ -11,8 +11,8 @@
 	ca-certificates \
 	curl \
 	--no-install-recommends \
-    && mkdir -p /etc/consul.d/ \
-    && chmod +x /usr/local/bin/consul \
-    && chmod +x /usr/local/bin/curl-unix-socket
+	&& mkdir -p /etc/consul.d/ \
+	&& chmod +x /usr/local/bin/consul \
+	&& chmod +x /usr/local/bin/curl-unix-socket
 
 ENTRYPOINT [ "/usr/local/bin/consul" ]
diff --git a/deb-dev/Dockerfile b/deb-dev/Dockerfile
index e9b5cf2..d336344 100644
--- a/deb-dev/Dockerfile
+++ b/deb-dev/Dockerfile
@@ -2,26 +2,26 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    debhelper \
-    devscripts \
-    equivs \
-    file \
-    gcc \
-    git \
-    gnupg \
-    libwww-perl \
-    make \
-    patch \
-    patchutils \
-    quilt \
-    silversearcher-ag \
-    tree \
-    vim \
-    xutils-dev \
-    --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
+	ca-certificates \
+	curl \
+	debhelper \
+	devscripts \
+	equivs \
+	file \
+	gcc \
+	git \
+	gnupg \
+	libwww-perl \
+	make \
+	patch \
+	patchutils \
+	quilt \
+	silversearcher-ag \
+	tree \
+	vim \
+	xutils-dev \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN printf '\nalias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"\ncomplete -F _quilt_completion $_quilt_complete_opt dquilt\n' >> /root/.bashrc
 
diff --git a/doctor/Dockerfile b/doctor/Dockerfile
index 04ed0d3..8ead835 100644
--- a/doctor/Dockerfile
+++ b/doctor/Dockerfile
@@ -1,18 +1,18 @@
-# VERSION:        0.1
-# DESCRIPTION:    Run text-based emacs doctor in a container
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Run text-based emacs doctor in a container
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build doctor in a container with all
-#   dependencies installed. 
-#   Tested on Debian Jessie
+#	This file describes how to build doctor in a container with all
+#	dependencies installed. 
+#	Tested on Debian Jessie
 # USAGE:
-#   # Download doctor Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/doctor/Dockerfile
+#	# Download doctor Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/doctor/Dockerfile
 #
-#   # Build doctor image
-#   docker build -t doctor .
+#	# Build doctor image
+#	docker build -t doctor .
 #
-#   docker run -it doctor
+#	docker run -it doctor
 #
 
 # Base docker image
@@ -21,8 +21,8 @@
 
 # Install emacs
 RUN apt-get update && apt-get install -y \
-    emacs \
-    --no-install-recommends
+	emacs \
+	--no-install-recommends
 
 # Autorun doctor
 CMD ["/usr/bin/emacs", "-f", "doctor"]
diff --git a/dunnet/Dockerfile b/dunnet/Dockerfile
index 3d9eead..ac83101 100644
--- a/dunnet/Dockerfile
+++ b/dunnet/Dockerfile
@@ -1,18 +1,18 @@
-# VERSION:        0.1
-# DESCRIPTION:    Run text-based game dunnet in a container
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Run text-based game dunnet in a container
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build dunnet in a container with all
-#   dependencies installed.
-#   Tested on Debian Jessie
+#	This file describes how to build dunnet in a container with all
+#	dependencies installed.
+#	Tested on Debian Jessie
 # USAGE:
-#   # Download dunnet Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/dunnet/Dockerfile
+#	# Download dunnet Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/dunnet/Dockerfile
 #
-#   # Build dunnet image
-#   docker build -t dunnet .
+#	# Build dunnet image
+#	docker build -t dunnet .
 #
-#   docker run -it dunnet
+#	docker run -it dunnet
 #
 
 # Base docker image
@@ -21,8 +21,8 @@
 
 # Install emacs
 RUN apt-get update && apt-get install -y \
-    emacs \
-    --no-install-recommends
+	emacs \
+	--no-install-recommends
 
 # Autorun dunnet
 CMD ["/usr/bin/emacs", "-batch", "-l", "dunnet"]
diff --git a/evince/Dockerfile b/evince/Dockerfile
index 4043326..71b0381 100644
--- a/evince/Dockerfile
+++ b/evince/Dockerfile
@@ -2,21 +2,21 @@
 # DESCRIPTION: Create evince container with its dependencies (https://wiki.gnome.org/Apps/Evince)
 # AUTHOR: Christian Koep <christian.koep@fom-net.de>
 # USAGE:
-#   # Build evince image
-#   docker build -t evince .
+#	# Build evince image
+#	docker build -t evince .
 #
-#   # Run the container and mount your documents
-#   docker run -it \
-#              -v $HOME/documents/:/root/documents/ \
-#              -v /tmp/.X11-unix:/tmp/.X11-unix \
-#              -e DISPLAY=$DISPLAY \
-#              evince
+#	# Run the container and mount your documents
+#	docker run -it \
+#			   -v $HOME/documents/:/root/documents/ \
+#			   -v /tmp/.X11-unix:/tmp/.X11-unix \
+#			   -e DISPLAY=$DISPLAY \
+#			   evince
 #
 
 FROM debian:jessie
 MAINTAINER Christian Koep <christian.koep@fom-net.de>
 
 RUN apt-get -qq update && apt-get install -y --no-install-recommends \
-    evince
+	evince
 
 CMD ["/usr/bin/evince"]
diff --git a/fish/Dockerfile b/fish/Dockerfile
index fb7eaf9..d753129 100644
--- a/fish/Dockerfile
+++ b/fish/Dockerfile
@@ -2,10 +2,10 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key D880C8E4 \
-    && echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/2/Debian_7.0/ ./' > /etc/apt/sources.list.d/fish-shell.list \
-    && apt-get update && apt-get install -y \
-    fish \
-    --no-install-recommends \
-    && mkdir -p /root/.config/fish/completions
+	&& echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/2/Debian_7.0/ ./' > /etc/apt/sources.list.d/fish-shell.list \
+	&& apt-get update && apt-get install -y \
+	fish \
+	--no-install-recommends \
+	&& mkdir -p /root/.config/fish/completions
 
 ENTRYPOINT [ "fish" ]
diff --git a/geary/Dockerfile b/geary/Dockerfile
index 6738602..d89eb9b 100644
--- a/geary/Dockerfile
+++ b/geary/Dockerfile
@@ -2,7 +2,7 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    geary \
-    --no-install-recommends
+	geary \
+	--no-install-recommends
 
 ENTRYPOINT [ "geary" ]
diff --git a/gimp/Dockerfile b/gimp/Dockerfile
index 59d0b82..ddf798a 100644
--- a/gimp/Dockerfile
+++ b/gimp/Dockerfile
@@ -1,18 +1,18 @@
 # Run gimp in a contianer
 #
 # docker run -d \
-#   -v /etc/localtime:/etc/localtime:ro \
-#   -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY \
-#   -v $HOME/Pictures:/root/Pictures \
-#   --name gimp \
-#   jess/gimp
+#	-v /etc/localtime:/etc/localtime:ro \
+#	-v /tmp/.X11-unix:/tmp/.X11-unix \
+#	-e DISPLAY=unix$DISPLAY \
+#	-v $HOME/Pictures:/root/Pictures \
+#	--name gimp \
+#	jess/gimp
 #
 FROM debian:jessie
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    gimp \
-    --no-install-recommends
+	gimp \
+	--no-install-recommends
 
 ENTRYPOINT [ "gimp" ]
diff --git a/glxgears/Dockerfile b/glxgears/Dockerfile
index 0097f18..d822daf 100644
--- a/glxgears/Dockerfile
+++ b/glxgears/Dockerfile
@@ -1,13 +1,13 @@
 # To use:
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY --device /dev/dri jess/glxgears
+#	docker run -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY --device /dev/dri jess/glxgears
 # Base docker image
 FROM debian:jessie
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 # Install all the things
 RUN apt-get update && apt-get install -y \
-    mesa-utils \
-    --no-install-recommends
+	mesa-utils \
+	--no-install-recommends
 
 ENV LIBGL_DEBUG verbose
 
diff --git a/gparted/Dockerfile b/gparted/Dockerfile
index 0acec77..f0b58ea 100644
--- a/gparted/Dockerfile
+++ b/gparted/Dockerfile
@@ -1,20 +1,20 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create gparted container with its dependencies
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Create gparted container with its dependencies
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build a gparted container with all
-#   dependencies installed. It uses native X11 unix socket. 
-#   Tested on Debian Jessie
+#	This file describes how to build a gparted container with all
+#	dependencies installed. It uses native X11 unix socket. 
+#	Tested on Debian Jessie
 # USAGE:
-#   # Download gparted Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/gparted/Dockerfile
+#	# Download gparted Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/gparted/Dockerfile
 #
-#   # Build gparted image
-#   docker build -t gparted .
+#	# Build gparted image
+#	docker build -t gparted .
 #
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     --device=/dev/sda:/dev/sda \
-#     -e DISPLAY=unix$DISPLAY gparted
+#	docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
+#	  --device=/dev/sda:/dev/sda \
+#	  -e DISPLAY=unix$DISPLAY gparted
 #
 
 # Base docker image
@@ -23,10 +23,10 @@
 
 # Install Gparted and its dependencies
 RUN apt-get update && apt-get install -y \
-    dosfstools \
-    gparted \
-    libcanberra-gtk-module \
-    --no-install-recommends
+	dosfstools \
+	gparted \
+	libcanberra-gtk-module \
+	--no-install-recommends
 
 # Autorun gparted
 CMD ["/usr/sbin/gparted"]
diff --git a/icedove/Dockerfile b/icedove/Dockerfile
index 4ec34d2..cf3f568 100644
--- a/icedove/Dockerfile
+++ b/icedove/Dockerfile
@@ -2,7 +2,7 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    icedove \
-    --no-install-recommends
+	icedove \
+	--no-install-recommends
 
 ENTRYPOINT [ "icedove" ]
diff --git a/iceweasel/Dockerfile b/iceweasel/Dockerfile
index da77abf..7b7bfa3 100644
--- a/iceweasel/Dockerfile
+++ b/iceweasel/Dockerfile
@@ -2,13 +2,13 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN sed -i.bak 's/sid main/sid main contrib/g' /etc/apt/sources.list && \
-    apt-get update && apt-get install -y \
-    flashplugin-nonfree \
-    hicolor-icon-theme \
-    iceweasel \
-    libgl1-mesa-dri \
-    libgl1-mesa-glx \
-    --no-install-recommends
+	apt-get update && apt-get install -y \
+	flashplugin-nonfree \
+	hicolor-icon-theme \
+	iceweasel \
+	libgl1-mesa-dri \
+	libgl1-mesa-glx \
+	--no-install-recommends
 
 COPY local.conf /etc/fonts/local.conf
 
diff --git a/imagemagick/Dockerfile b/imagemagick/Dockerfile
index 437cb4a..8be4dc5 100644
--- a/imagemagick/Dockerfile
+++ b/imagemagick/Dockerfile
@@ -2,7 +2,7 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    imagemagick \
-    --no-install-recommends
+	imagemagick \
+	--no-install-recommends
 
 CMD [ "imagemagick" ]
diff --git a/imagemin/Dockerfile b/imagemin/Dockerfile
index 72bd26a..106280e 100644
--- a/imagemin/Dockerfile
+++ b/imagemin/Dockerfile
@@ -1,10 +1,10 @@
 # Run imagemin in a container:
 #
 # docker run --rm -it \
-#   -v /etc/localtime:/etc/localtime:ro \
-#   -v $HOME/Pictures:/root/Pictures \
-#   --entrypoint bash \
-#   jess/imagemin
+#	-v /etc/localtime:/etc/localtime:ro \
+#	-v $HOME/Pictures:/root/Pictures \
+#	--entrypoint bash \
+#	jess/imagemin
 #
 FROM node
 MAINTAINER Jessica Frazelle <jess@docker.com>
diff --git a/inkscape/Dockerfile b/inkscape/Dockerfile
index dbfce14..5208ae8 100644
--- a/inkscape/Dockerfile
+++ b/inkscape/Dockerfile
@@ -1,9 +1,9 @@
 # Run inkscape in a container
 #
 # docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -v /inkscape/:/workspace \
-#     -e DISPLAY=unix$DISPLAY \
-#     infoslack/inkscape
+#	  -v /inkscape/:/workspace \
+#	  -e DISPLAY=unix$DISPLAY \
+#	  infoslack/inkscape
 #
 FROM ubuntu:14.04
 MAINTAINER Daniel Romero <infoslack@gmail.com>
@@ -11,13 +11,13 @@
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get install -y \
-    python-software-properties \
-    software-properties-common
+	python-software-properties \
+	software-properties-common
 
 RUN add-apt-repository ppa:inkscape.dev/stable && \
-    apt-get update && \
-    apt-get install -y -qq --no-install-recommends inkscape && \
-    rm -rf /var/lib/apt/lists/*
+	apt-get update && \
+	apt-get install -y -qq --no-install-recommends inkscape && \
+	rm -rf /var/lib/apt/lists/*
 
 VOLUME /workspace
 WORKDIR /workspace
diff --git a/ipython-notebook/Dockerfile b/ipython-notebook/Dockerfile
index 13d3191..ff55f3b 100644
--- a/ipython-notebook/Dockerfile
+++ b/ipython-notebook/Dockerfile
@@ -5,11 +5,11 @@
 
 # install linear algebra dependencies
 RUN apt-get update && apt-get install -y \
-    gfortran \
-    libopenblas-dev \
-    liblapack-dev \
-    libzmq-dev \
-    --no-install-recommends
+	gfortran \
+	libopenblas-dev \
+	liblapack-dev \
+	libzmq-dev \
+	--no-install-recommends
 RUN pip install -U scipy
 
 RUN pip install -U matplotlib
diff --git a/keepass2/Dockerfile b/keepass2/Dockerfile
index 6e12f1e..8c84d9d 100644
--- a/keepass2/Dockerfile
+++ b/keepass2/Dockerfile
@@ -2,22 +2,22 @@
 # DESCRIPTION: Create keepass2 container with its dependencies
 # AUTHOR: Christian Koep <christian.koep@fom-net.de>
 # USAGE:
-#   # Build keepass2 image
-#   docker build -t keepass2 .
+#	# Build keepass2 image
+#	docker build -t keepass2 .
 #
-#   # Run the container and mount your keepass2 database file
-#   docker run -it -v /home/$USER/DB.kdbx:/root/DB.kdbx -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY keepass2
+#	# Run the container and mount your keepass2 database file
+#	docker run -it -v /home/$USER/DB.kdbx:/root/DB.kdbx -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY keepass2
 #
 # ISSUES:
-#   # 'Gtk: cannot open display: :0'
-#   Try to set 'DISPLAY=your_host_ip:0' or run 'xhost +' on your host.
-#   (see: http://stackoverflow.com/questions/28392949/running-chromium-inside-docker-gtk-cannot-open-display-0)
+#	# 'Gtk: cannot open display: :0'
+#	Try to set 'DISPLAY=your_host_ip:0' or run 'xhost +' on your host.
+#	(see: http://stackoverflow.com/questions/28392949/running-chromium-inside-docker-gtk-cannot-open-display-0)
 #
 
 FROM debian:jessie
 MAINTAINER Christian Koep <christian.koep@fom-net.de>
 ENV DEBIAN_FRONTEND noninteractiv
 RUN apt-get update && apt-get install -y \
-    keepass2 \
-    xdotool
+	keepass2 \
+	xdotool
 CMD ["/usr/bin/keepass2"]
diff --git a/kernel-builder/Dockerfile b/kernel-builder/Dockerfile
index 029be5b..2a15540 100644
--- a/kernel-builder/Dockerfile
+++ b/kernel-builder/Dockerfile
@@ -2,12 +2,12 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    kernel-package \
-    make \
-    libncurses5-dev \
-    --no-install-recommends
+	ca-certificates \
+	curl \
+	kernel-package \
+	make \
+	libncurses5-dev \
+	--no-install-recommends
 
 ENV HOME /root
 WORKDIR $HOME
@@ -16,17 +16,17 @@
 
 # add install_kernel helper func
 RUN { \
-        echo '\ninstall_kernel(){'; \
-        echo '\tlocal VERSION=$1'; \
-        echo '\n\tif [[ -z $VERSION ]]; then'; \
-        echo '\t\techo "Please specify a kernel version."'; \
-        echo '\t\texit 1'; \
-        echo '\tfi\n'; \
-        echo '\tlocal MAJOR_VERSION=${VERSION:0:1}'; \
-        echo '\n\t[ -d /usr/src/linux-${VERSION} ] || curl -sSL https://www.kernel.org/pub/linux/kernel/v${MAJOR_VERSION}.x/linux-${VERSION}.tar.xz | tar -v -C /usr/src -xJ'; \
-        echo '\n\tcd /usr/src/linux-${VERSION}'; \
-        echo '\n\tnice -19 make -j$JOBS KDEB_PKGVERSION=$PKGVERSION INSTALL_MOD_STRIP=1 deb-pkg'; \
-        echo '}'; \
-    } >> ~/.bashrc
+		echo '\ninstall_kernel(){'; \
+		echo '\tlocal VERSION=$1'; \
+		echo '\n\tif [[ -z $VERSION ]]; then'; \
+		echo '\t\techo "Please specify a kernel version."'; \
+		echo '\t\texit 1'; \
+		echo '\tfi\n'; \
+		echo '\tlocal MAJOR_VERSION=${VERSION:0:1}'; \
+		echo '\n\t[ -d /usr/src/linux-${VERSION} ] || curl -sSL https://www.kernel.org/pub/linux/kernel/v${MAJOR_VERSION}.x/linux-${VERSION}.tar.xz | tar -v -C /usr/src -xJ'; \
+		echo '\n\tcd /usr/src/linux-${VERSION}'; \
+		echo '\n\tnice -19 make -j$JOBS KDEB_PKGVERSION=$PKGVERSION INSTALL_MOD_STRIP=1 deb-pkg'; \
+		echo '}'; \
+	} >> ~/.bashrc
 
 CMD [ "bash" ]
diff --git a/libreoffice/Dockerfile b/libreoffice/Dockerfile
index c6f546e..aec5ce2 100644
--- a/libreoffice/Dockerfile
+++ b/libreoffice/Dockerfile
@@ -2,7 +2,7 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    libreoffice \
-    --no-install-recommends
+	libreoffice \
+	--no-install-recommends
 
 ENTRYPOINT [ "libreoffice" ]
diff --git a/lynx/Dockerfile b/lynx/Dockerfile
index dc03304..de755fd 100644
--- a/lynx/Dockerfile
+++ b/lynx/Dockerfile
@@ -2,7 +2,7 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    lynx \
-    --no-install-recommends
+	lynx \
+	--no-install-recommends
 
 ENTRYPOINT [ "lynx" ]
diff --git a/mailman/Dockerfile b/mailman/Dockerfile
index 1a50a2d..bd9a34a 100644
--- a/mailman/Dockerfile
+++ b/mailman/Dockerfile
@@ -9,11 +9,11 @@
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y \
-    lighttpd \
-    mailman \
-    postfix \
-    supervisor \
-    --no-install-recommends
+	lighttpd \
+	mailman \
+	postfix \
+	supervisor \
+	--no-install-recommends
 
 # Lighttpd configuration
 ADD lighttpd.conf /etc/lighttpd/lighttpd.conf
diff --git a/mdp/Dockerfile b/mdp/Dockerfile
index e74c6b3..1fd1b2a 100644
--- a/mdp/Dockerfile
+++ b/mdp/Dockerfile
@@ -2,24 +2,24 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    gcc \
-    git \
-    libncurses5 \
-    libncurses5-dev \
-    libncursesw5 \
-    libncursesw5-dev \
-    make \
-    --no-install-recommends
+	ca-certificates \
+	gcc \
+	git \
+	libncurses5 \
+	libncurses5-dev \
+	libncursesw5 \
+	libncursesw5-dev \
+	make \
+	--no-install-recommends
 
 RUN git clone --recursive https://github.com/visit1985/mdp.git /src
 
 WORKDIR /src
 
-ENV TERM    xterm-256color
-ENV DEBUG   1 
+ENV TERM	xterm-256color
+ENV DEBUG	1 
 
 RUN make \
-    && make install
+	&& make install
 
 ENTRYPOINT [ "/usr/local/bin/mdp" ]
diff --git a/mutt/Dockerfile b/mutt/Dockerfile
index d6fe007..1c8597f 100644
--- a/mutt/Dockerfile
+++ b/mutt/Dockerfile
@@ -4,9 +4,9 @@
 	&& useradd --create-home -d /home/user -g user -u 1000 user
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    git \
-    mutt-patched
+	ca-certificates \
+	git \
+	mutt-patched
 
 # a browser is necessary!
 RUN apt-get update && apt-get install -y lynx
@@ -23,13 +23,13 @@
 
 # vim settings
 RUN git clone https://github.com/jfrazelle/.vim.git $HOME/.vim \
-    && git clone https://github.com/altercation/vim-colors-solarized $HOME/.vim/bundle/vim-colors-solarized \
-    && cp $HOME/.vim/vimrc.txt $HOME/.vimrc
+	&& git clone https://github.com/altercation/vim-colors-solarized $HOME/.vim/bundle/vim-colors-solarized \
+	&& cp $HOME/.vim/vimrc.txt $HOME/.vimrc
 
 ENV LANG C.UTF-8
 
-COPY    entrypoint.sh   /entrypoint.sh
-COPY    .mutt           $HOME/.mutt
+COPY	entrypoint.sh	/entrypoint.sh
+COPY	.mutt			$HOME/.mutt
 
 ENTRYPOINT ["/entrypoint.sh"]
 
diff --git a/nerdy/Dockerfile b/nerdy/Dockerfile
index bf5c15a..71da701 100644
--- a/nerdy/Dockerfile
+++ b/nerdy/Dockerfile
@@ -2,14 +2,14 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    cowsay \
-    curl \
-    figlet \
-    imagemagick \
-    jp2a \
-    python \
-    --no-install-recommends
+	ca-certificates \
+	cowsay \
+	curl \
+	figlet \
+	imagemagick \
+	jp2a \
+	python \
+	--no-install-recommends
 
 ENV HOME /root
 WORKDIR $HOME
diff --git a/rainbowstream/Dockerfile b/rainbowstream/Dockerfile
index afedd7f..45c446c 100644
--- a/rainbowstream/Dockerfile
+++ b/rainbowstream/Dockerfile
@@ -2,11 +2,11 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    libjpeg-dev \
-    libfreetype6 \
-    libfreetype6-dev \
-    zlib1g-dev \
-    --no-install-recommends
+	libjpeg-dev \
+	libfreetype6 \
+	libfreetype6-dev \
+	zlib1g-dev \
+	--no-install-recommends
 
 RUN pip install rainbowstream
 
diff --git a/rdesktop/Dockerfile b/rdesktop/Dockerfile
index 961bd8c..1270892 100644
--- a/rdesktop/Dockerfile
+++ b/rdesktop/Dockerfile
@@ -3,7 +3,7 @@
 
 RUN apt-get update && apt-get install -y \
 	libgssapi-krb5-2 \
-    rdesktop \
-    --no-install-recommends
+	rdesktop \
+	--no-install-recommends
 
 ENTRYPOINT [ "rdesktop" ]
diff --git a/remmina/Dockerfile b/remmina/Dockerfile
index f305f90..222b22b 100644
--- a/remmina/Dockerfile
+++ b/remmina/Dockerfile
@@ -1,12 +1,12 @@
 # Run remmina in a container
 #
 # docker run -d \
-#   -v /etc/localtime:/etc/localtime:ro \
-#   -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY \
-#   -v $HOME/.remmina:/root/.remmina \
-#   --name remmina \
-#   jess/remmina
+#	-v /etc/localtime:/etc/localtime:ro \
+#	-v /tmp/.X11-unix:/tmp/.X11-unix \
+#	-e DISPLAY=unix$DISPLAY \
+#	-v $HOME/.remmina:/root/.remmina \
+#	--name remmina \
+#	jess/remmina
 #
 FROM ubuntu:14.10
 MAINTAINER Jessica Frazelle <jess@docker.com>
@@ -17,8 +17,8 @@
 	apt-add-repository ppa:remmina-ppa-team/remmina-next && \
 	apt-get update && apt-get install -y \
 	hicolor-icon-theme \
-    remmina \
+	remmina \
 	remmina-plugin-rdp \
-    --no-install-recommends
+	--no-install-recommends
 
 ENTRYPOINT [ "remmina" ]
diff --git a/rust/Dockerfile b/rust/Dockerfile
index bdedfdb..bac95cf 100644
--- a/rust/Dockerfile
+++ b/rust/Dockerfile
@@ -2,9 +2,9 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
+	ca-certificates \
 	curl \
-    --no-install-recommends \
+	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/rust/rustc/bin
diff --git a/sentry/Dockerfile b/sentry/Dockerfile
index 79aa6e7..f053c67 100644
--- a/sentry/Dockerfile
+++ b/sentry/Dockerfile
@@ -2,17 +2,17 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    g++ \
-    libpq5 \
-    libpq-dev \
-    libxml2-dev \
-    locales \
-    postgresql-client-9.4 \
-    postgresql-client-common \
-    python \
-    python-dev \
-    python-pip \
-    --no-install-recommends
+	g++ \
+	libpq5 \
+	libpq-dev \
+	libxml2-dev \
+	locales \
+	postgresql-client-9.4 \
+	postgresql-client-common \
+	python \
+	python-dev \
+	python-pip \
+	--no-install-recommends
 
 # locales
 ENV LANGUAGE en_US.UTF-8
diff --git a/skype/Dockerfile b/skype/Dockerfile
index b521f98..b677c7f 100644
--- a/skype/Dockerfile
+++ b/skype/Dockerfile
@@ -1,9 +1,9 @@
 # Run skype in a container
 #
 # docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -v /dev/snd:/dev/snd \
-#     -e DISPLAY=unix$DISPLAY \
-#     jess/skype
+#	  -v /dev/snd:/dev/snd \
+#	  -e DISPLAY=unix$DISPLAY \
+#	  jess/skype
 #
 FROM debian:jessie
 
@@ -13,15 +13,15 @@
 # Setup multiarch because Skype is 32bit only
 # Make sure the repository information is up to date
 RUN dpkg --add-architecture i386 && \
-    apt-get update && apt-get install -y \
-    curl \
-    --no-install-recommends
+	apt-get update && apt-get install -y \
+	curl \
+	--no-install-recommends
 
 
 # Install Skype
 RUN curl http://download.skype.com/linux/skype-debian_4.3.0.37-1_i386.deb > /usr/src/skype.deb && \ 
-    dpkg -i /usr/src/skype.deb || true && \
-    apt-get install -fy
+	dpkg -i /usr/src/skype.deb || true && \
+	apt-get install -fy
 
 # Start Skype
 ENTRYPOINT ["skype"]
diff --git a/slack/Dockerfile b/slack/Dockerfile
index eeff32d..1cc4abc 100644
--- a/slack/Dockerfile
+++ b/slack/Dockerfile
@@ -14,15 +14,15 @@
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
 RUN apt-get update && apt-get install -y \
-    dbus-x11 \
-    dunst \
-    hunspell-en-us \
-    python3-dbus \
-    software-properties-common \
-    --no-install-recommends && \
-    apt-add-repository -y ppa:rael-gc/scudcloud && \
-    apt-get update && \
-    apt-get install -y \
-    scudcloud
+	dbus-x11 \
+	dunst \
+	hunspell-en-us \
+	python3-dbus \
+	software-properties-common \
+	--no-install-recommends && \
+	apt-add-repository -y ppa:rael-gc/scudcloud && \
+	apt-get update && \
+	apt-get install -y \
+	scudcloud
 
 ENTRYPOINT ["/usr/bin/scudcloud"]
diff --git a/spotify-wine/Dockerfile b/spotify-wine/Dockerfile
index 9343ef9..f105f43 100644
--- a/spotify-wine/Dockerfile
+++ b/spotify-wine/Dockerfile
@@ -1,13 +1,13 @@
 # Run spotify windows app in a container with wine
 #
 # docker run --rm -it \
-#   -v /etc/localtime:/etc/localtime:ro \
-#   --cpuset-cpus 0 \
-#   -v /tmp/.X11-unix:/tmp/.X11-unix  \
-#   -e DISPLAY=unix$DISPLAY \
-#   --device /dev/snd:/dev/snd \
-#   --name spotify-wine \
-#   jess/spotify-wine bash
+#	-v /etc/localtime:/etc/localtime:ro \
+#	--cpuset-cpus 0 \
+#	-v /tmp/.X11-unix:/tmp/.X11-unix  \
+#	-e DISPLAY=unix$DISPLAY \
+#	--device /dev/snd:/dev/snd \
+#	--name spotify-wine \
+#	jess/spotify-wine bash
 #
 FROM debian:jessie
 MAINTAINER Jessie Frazelle <jess@linux.com>
@@ -16,12 +16,12 @@
 # and iceweasel since we have to sign in w facebook
 # GROSS
 RUN apt-get update && apt-get install -y \
-    wine \
-    --no-install-recommends && \
-    dpkg --add-architecture i386 && \
-    apt-get update && \
-    apt-get install -y \
-    wine32
+	wine \
+	--no-install-recommends && \
+	dpkg --add-architecture i386 && \
+	apt-get update && \
+	apt-get install -y \
+	wine32
 
 COPY ./SpotifySetup.exe /usr/src/SpotifySetup.exe
 
diff --git a/spotify/Dockerfile b/spotify/Dockerfile
index 453055c..2eb09b8 100644
--- a/spotify/Dockerfile
+++ b/spotify/Dockerfile
@@ -1,27 +1,27 @@
 # Run spotify in a container
 #
 # docker run -d \
-#   -v /etc/localtime:/etc/localtime:ro \
-#   -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY \
-#   --device /dev/snd:/dev/snd \
-#   -v $HOME/.spotify/config:/root/.config/spotify \
-#   -v $HOME/.spotify/cache:/root/.cache/spotify \
-#   --name spotify \
-#   jess/spotify
+#	-v /etc/localtime:/etc/localtime:ro \
+#	-v /tmp/.X11-unix:/tmp/.X11-unix \
+#	-e DISPLAY=unix$DISPLAY \
+#	--device /dev/snd:/dev/snd \
+#	-v $HOME/.spotify/config:/root/.config/spotify \
+#	-v $HOME/.spotify/cache:/root/.cache/spotify \
+#	--name spotify \
+#	jess/spotify
 #
 FROM ubuntu:14.04
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
 RUN apt-get update && apt-get install -y \
-    libpangoxft-1.0-0 \
-    alsa-utils \
-    software-properties-common \
-    --no-install-recommends && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 94558F59 && \
-    echo "deb http://repository.spotify.com stable non-free" >> /etc/apt/sources.list.d/spotify.list && \
-    apt-get update && \
-    apt-get install -y \
-    spotify-client
+	libpangoxft-1.0-0 \
+	alsa-utils \
+	software-properties-common \
+	--no-install-recommends && \
+	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 94558F59 && \
+	echo "deb http://repository.spotify.com stable non-free" >> /etc/apt/sources.list.d/spotify.list && \
+	apt-get update && \
+	apt-get install -y \
+	spotify-client
 
-ENTRYPOINT  [ "/usr/bin/spotify" ]
+ENTRYPOINT	[ "/usr/bin/spotify" ]
diff --git a/ssr/Dockerfile b/ssr/Dockerfile
index 341a05b..bc738b3 100644
--- a/ssr/Dockerfile
+++ b/ssr/Dockerfile
@@ -1,19 +1,19 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create SimpleScreenRecorder in a container 
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Create SimpleScreenRecorder in a container 
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build SimpleScreenRecoder
-#   in a container with all dependencies installed.
-#   Tested on Debian Jessie.
+#	This file describes how to build SimpleScreenRecoder
+#	in a container with all dependencies installed.
+#	Tested on Debian Jessie.
 # USAGE:
-#   # Download ssr Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/ssr/Dockerfile
+#	# Download ssr Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/ssr/Dockerfile
 #
-#   # Build ssr image
-#   docker build -t ssr .
+#	# Build ssr image
+#	docker build -t ssr .
 #
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -e DISPLAY=unix$DISPLAY ssr
+#	docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
+#	  -e DISPLAY=unix$DISPLAY ssr
 #
 
 # Base docker image
@@ -22,42 +22,42 @@
 
 # Install dependencies
 RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y \
-    build-essential \
-    ca-certificates \
-    git \
-    pkg-config \
-    qt4-qmake \
-    libqt4-dev \
-    libavformat-dev \
-    libavcodec-dev \
-    libavutil-dev \
-    libswscale-dev \
-    libasound2-dev \
-    libpulse-dev \
-    libjack-jackd2-dev \
-    libgl1-mesa-dev \
-    libglu1-mesa-dev \
-    libx11-dev \
-    libxfixes-dev \
-    libxext-dev \
-    libxi-dev \
-    g++-multilib \
-    libx11-6 \
-    libxext6 \
-    libxfixes3 \
-    libxfixes3:i386 \
-    libglu1-mesa:i386 \
-    sudo \
-    --no-install-recommends
+	build-essential \
+	ca-certificates \
+	git \
+	pkg-config \
+	qt4-qmake \
+	libqt4-dev \
+	libavformat-dev \
+	libavcodec-dev \
+	libavutil-dev \
+	libswscale-dev \
+	libasound2-dev \
+	libpulse-dev \
+	libjack-jackd2-dev \
+	libgl1-mesa-dev \
+	libglu1-mesa-dev \
+	libx11-dev \
+	libxfixes-dev \
+	libxext-dev \
+	libxi-dev \
+	g++-multilib \
+	libx11-6 \
+	libxext6 \
+	libxfixes3 \
+	libxfixes3:i386 \
+	libglu1-mesa:i386 \
+	sudo \
+	--no-install-recommends
 
 # make adjustments
 RUN cd /usr/lib/i386-linux-gnu && \
-    ln -s libGL.so.1 libGL.so && \
-    ln -s libGLU.so.1 libGLU.so && \
-    ln -s libX11.so.6 libX11.so && \
-    ln -s libXext.so.6 libXext.so && \
-    ln -s libXfixes.so.3 libXfixes.so && \
-    ldconfig
+	ln -s libGL.so.1 libGL.so && \
+	ln -s libGLU.so.1 libGLU.so && \
+	ln -s libX11.so.6 libX11.so && \
+	ln -s libXext.so.6 libXext.so && \
+	ln -s libXfixes.so.3 libXfixes.so && \
+	ldconfig
 
 # add user
 #RUN adduser --system --home=/src --shell=/bin/sh --no-create-home \
@@ -71,9 +71,9 @@
 RUN sed -i".bak" '10,13d' /src/simple-build-and-install
 RUN sed -i".bak" '13,14d' /src/postinstall
 RUN cd /src && \
-    #chown -R ssr /src && \
-    #sudo -u ssr 
-    /src/simple-build-and-install
+	#chown -R ssr /src && \
+	#sudo -u ssr 
+	/src/simple-build-and-install
 
 # Autorun ssr
 CMD ["/usr/bin/simplescreenrecorder"]
diff --git a/stress/Dockerfile b/stress/Dockerfile
index d403027..6b6dded 100644
--- a/stress/Dockerfile
+++ b/stress/Dockerfile
@@ -2,7 +2,7 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    stress \
-    --no-install-recommends
+	stress \
+	--no-install-recommends
 
 CMD [ "stress" ]
diff --git a/sublime-text-3/Dockerfile b/sublime-text-3/Dockerfile
index 9fc2c70..aa96be6 100644
--- a/sublime-text-3/Dockerfile
+++ b/sublime-text-3/Dockerfile
@@ -2,36 +2,36 @@
 # DESCRIPTION: Create sublime-text 3 container with its dependencies (https://www.sublimetext.com/3)
 # AUTHOR: Christian Koep <christian.koep@fom-net.de>
 # USAGE:
-#   # Build sublime-text 3 image
-#   docker build -t sublime-text:3 .
+#	# Build sublime-text 3 image
+#	docker build -t sublime-text:3 .
 #
-#   # Run the container and mount the local settings and your code
-#   docker run -it \
-#              -v $HOME/.config/sublime-text-3/:/root/.config/sublime-text-3 \
-#              -v $HOME/development:/root/development \
-#              -v /tmp/.X11-unix:/tmp/.X11-unix \
-#              -e DISPLAY=$DISPLAY sublime-text:3
+#	# Run the container and mount the local settings and your code
+#	docker run -it \
+#			   -v $HOME/.config/sublime-text-3/:/root/.config/sublime-text-3 \
+#			   -v $HOME/development:/root/development \
+#			   -v /tmp/.X11-unix:/tmp/.X11-unix \
+#			   -e DISPLAY=$DISPLAY sublime-text:3
 #
 # POSSIBLE ISSUES:
-#   # 'Gtk: cannot open display: :0'
-#   Try to set 'DISPLAY=your_host_ip:0' or run 'xhost +' on your host.
-#   (see: http://stackoverflow.com/questions/28392949/running-chromium-inside-docker-gtk-cannot-open-display-0)
+#	# 'Gtk: cannot open display: :0'
+#	Try to set 'DISPLAY=your_host_ip:0' or run 'xhost +' on your host.
+#	(see: http://stackoverflow.com/questions/28392949/running-chromium-inside-docker-gtk-cannot-open-display-0)
 #
 
 FROM debian:jessie
 MAINTAINER Christian Koep <christian.koep@fom-net.de>
 RUN apt-get update && apt-get -y install \
-    wget \
-    tar \
-    bzip2 \
-    libglib2.0-0 \
-    libx11-6 \
-    libcairo2 \
-    libpango-1.0-0 \
-    libpangocairo-1.0-0 \
-    libgtk2.0-0
+	wget \
+	tar \
+	bzip2 \
+	libglib2.0-0 \
+	libx11-6 \
+	libcairo2 \
+	libpango-1.0-0 \
+	libpangocairo-1.0-0 \
+	libgtk2.0-0
 RUN wget -q http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_3083_x64.tar.bz2 -O /usr/src/sublime.tar.bz2 && \
-    cd /usr/src && \
-    tar -xjf /usr/src/sublime.tar.bz2 && \
-    rm -f /usr/src/sublime.tar.bz2
+	cd /usr/src && \
+	tar -xjf /usr/src/sublime.tar.bz2 && \
+	rm -f /usr/src/sublime.tar.bz2
 CMD ["/usr/src/sublime_text_3/sublime_text", "-w"]
diff --git a/termboy/Dockerfile b/termboy/Dockerfile
index e12adc5..dce5d1f 100644
--- a/termboy/Dockerfile
+++ b/termboy/Dockerfile
@@ -1,18 +1,18 @@
-# VERSION:        0.1
-# DESCRIPTION:    Termboy in a container 
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Termboy in a container 
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build termboy
-#   in a container with all dependencies installed.
-#   Tested on Debian Jessie.
+#	This file describes how to build termboy
+#	in a container with all dependencies installed.
+#	Tested on Debian Jessie.
 # USAGE:
-#   # Download termboy Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/termboy/Dockerfile
+#	# Download termboy Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/termboy/Dockerfile
 #
-#   # Build termboy image
-#   docker build -t termboy .
+#	# Build termboy image
+#	docker build -t termboy .
 #
-#   docker run -it termboy
+#	docker run -it termboy
 #
 
 # Base docker image
@@ -27,8 +27,8 @@
 
 # Install dependencies
 RUN apt-get update && apt-get install -y \
-    kbd && \
-    mkdir -p $HOME/.config/termboy
+	kbd && \
+	mkdir -p $HOME/.config/termboy
 
 # add games
 COPY games $HOME/games
diff --git a/tetris/Dockerfile b/tetris/Dockerfile
index 6312a70..f1981f3 100644
--- a/tetris/Dockerfile
+++ b/tetris/Dockerfile
@@ -1,18 +1,18 @@
-# VERSION:        0.1
-# DESCRIPTION:    Run text-based emacs tetris in a container
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Run text-based emacs tetris in a container
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build tetris in a container with all
-#   dependencies installed. 
-#   Tested on Debian Jessie
+#	This file describes how to build tetris in a container with all
+#	dependencies installed. 
+#	Tested on Debian Jessie
 # USAGE:
-#   # Download tetris Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/tetris/Dockerfile
+#	# Download tetris Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/tetris/Dockerfile
 #
-#   # Build tetris image
-#   docker build -t tetris .
+#	# Build tetris image
+#	docker build -t tetris .
 #
-#   docker run -it tetris
+#	docker run -it tetris
 #
 
 # Base docker image
@@ -21,8 +21,8 @@
 
 # Install emacs
 RUN apt-get update && apt-get install -y \
-    emacs \
-    --no-install-recommends
+	emacs \
+	--no-install-recommends
 
 # Autorun tetris
 CMD ["/usr/bin/emacs", "-f", "tetris"]
diff --git a/tomahawk/Dockerfile b/tomahawk/Dockerfile
index e539f8c..4362eec 100644
--- a/tomahawk/Dockerfile
+++ b/tomahawk/Dockerfile
@@ -2,11 +2,11 @@
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
 RUN apt-get update && apt-get install -y \
-    software-properties-common \
-    --no-install-recommends && \
-    add-apt-repository ppa:tomahawk/ppa && \
-    apt-get update && \
-    apt-get install -y \
-    tomahawk
+	software-properties-common \
+	--no-install-recommends && \
+	add-apt-repository ppa:tomahawk/ppa && \
+	apt-get update && \
+	apt-get install -y \
+	tomahawk
 
-ENTRYPOINT  [ "/usr/bin/tomahawk" ]
+ENTRYPOINT	[ "/usr/bin/tomahawk" ]
diff --git a/tor-browser/Dockerfile b/tor-browser/Dockerfile
index 3c28597..2161844 100644
--- a/tor-browser/Dockerfile
+++ b/tor-browser/Dockerfile
@@ -1,27 +1,27 @@
 # Run tor browser in a container
 #
 # docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -v /dev/snd:/dev/snd \
-#     -e DISPLAY=unix$DISPLAY \
-#     jess/tor-browser
+#	  -v /dev/snd:/dev/snd \
+#	  -e DISPLAY=unix$DISPLAY \
+#	  jess/tor-browser
 #
 FROM debian:jessie
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    libasound2 \
-    libdbus-glib-1-2 \
-    libgtk2.0-0 \
-    libxrender1 \
-    libxt6 \
-    xz-utils \
-    && rm -rf /var/lib/apt/lists/*
+	ca-certificates \
+	curl \
+	libasound2 \
+	libdbus-glib-1-2 \
+	libgtk2.0-0 \
+	libxrender1 \
+	libxt6 \
+	xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 ENV HOME /home/user
 RUN useradd --create-home --home-dir $HOME user \
-    && chown -R user:user $HOME
+	&& chown -R user:user $HOME
 
 ENV LANG C.UTF-8
 
diff --git a/transmission-ui/Dockerfile b/transmission-ui/Dockerfile
index 42c9d35..e27b8ad 100644
--- a/transmission-ui/Dockerfile
+++ b/transmission-ui/Dockerfile
@@ -1,20 +1,20 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create transmission container with its dependencies
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Create transmission container with its dependencies
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build a transmission container with all
-#   dependencies installed. It uses native X11 unix socket. 
-#   Tested on Debian Jessie
+#	This file describes how to build a transmission container with all
+#	dependencies installed. It uses native X11 unix socket. 
+#	Tested on Debian Jessie
 # USAGE:
-#   # Download transmission-ui Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/transmission-ui/Dockerfile
+#	# Download transmission-ui Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/transmission-ui/Dockerfile
 #
-#   # Build transmission image
-#   docker build -t jess/transmission-ui .
+#	# Build transmission image
+#	docker build -t jess/transmission-ui .
 #
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -v /home/jessie/Torrents:/Torrents \
-#     -e DISPLAY=unix$DISPLAY jess/transmission-ui
+#	docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
+#	  -v /home/jessie/Torrents:/Torrents \
+#	  -e DISPLAY=unix$DISPLAY jess/transmission-ui
 #
 
 # Base docker image
@@ -23,11 +23,11 @@
 
 # Install transmission and its dependencies
 RUN apt-get update && apt-get install -y \
-    transmission-cli \
-    transmission-common \
-    transmission-daemon \
-    transmission-gtk \
-    --no-install-recommends
+	transmission-cli \
+	transmission-common \
+	transmission-daemon \
+	transmission-gtk \
+	--no-install-recommends
 
 # Autorun transmission
 CMD ["/usr/bin/transmission-gtk"]
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 0806468..9d10403 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -1,21 +1,21 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create transmission container with its dependencies
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
+# VERSION:		  0.1
+# DESCRIPTION:	  Create transmission container with its dependencies
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
 # COMMENTS:
-#   This file describes how to build a transmission container with all
-#   dependencies installed.
-#   Tested on Debian Jessie
+#	This file describes how to build a transmission container with all
+#	dependencies installed.
+#	Tested on Debian Jessie
 # USAGE:
-#   # Download transmission Dockerfile
-#   wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/transmission/Dockerfile
+#	# Download transmission Dockerfile
+#	wget http://raw.githubusercontent.com/jfrazelle/dockerfiles/master/transmission/Dockerfile
 #
-#   # Build transmission image
-#   docker build -t jess/transmission .
+#	# Build transmission image
+#	docker build -t jess/transmission .
 #
-#   docker run -d --name transmission \
-#     -v /home/jessie/Torrents:/transmission/download \
-#     -p 9091:9091 -p 51413:51413 -p 51413:51413/udp \
-#     jess/transmission
+#	docker run -d --name transmission \
+#	  -v /home/jessie/Torrents:/transmission/download \
+#	  -p 9091:9091 -p 51413:51413 -p 51413:51413/udp \
+#	  jess/transmission
 #
 
 # Base docker image
@@ -23,12 +23,12 @@
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    transmission-daemon \
-    && mkdir -p /transmission/download \
-    && mkdir -p /transmission/watch \
-    && mkdir -p /transmission/incomplete \
-    && mkdir -p /transmission/config \
-    && chmod 1777 /transmission
+	transmission-daemon \
+	&& mkdir -p /transmission/download \
+	&& mkdir -p /transmission/watch \
+	&& mkdir -p /transmission/incomplete \
+	&& mkdir -p /transmission/config \
+	&& chmod 1777 /transmission
 
 ENV TRANSMISSION_HOME /transmission/config
 
diff --git a/virtualbox/Dockerfile b/virtualbox/Dockerfile
index 9f165ec..100d2aa 100644
--- a/virtualbox/Dockerfile
+++ b/virtualbox/Dockerfile
@@ -1,21 +1,21 @@
 # Run virtualbox in a container
 #
 # docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -e DISPLAY=unix$DISPLAY \
-#     jess/virtualbox
+#	  -e DISPLAY=unix$DISPLAY \
+#	  jess/virtualbox
 #
 FROM debian:jessie
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    software-properties-common \
-    --no-install-recommends && \
-    curl -sSL https://www.virtualbox.org/download/oracle_vbox.asc | apt-key add - && \
-    echo "deb http://download.virtualbox.org/virtualbox/debian jessie contrib" >> /etc/apt/sources.list.d/virtualbox.list && \
-    apt-get update && \
-    apt-get install -y \
-    virtualbox
+	ca-certificates \
+	curl \
+	software-properties-common \
+	--no-install-recommends && \
+	curl -sSL https://www.virtualbox.org/download/oracle_vbox.asc | apt-key add - && \
+	echo "deb http://download.virtualbox.org/virtualbox/debian jessie contrib" >> /etc/apt/sources.list.d/virtualbox.list && \
+	apt-get update && \
+	apt-get install -y \
+	virtualbox
 
-ENTRYPOINT  [ "/usr/bin/virtualbox" ]
+ENTRYPOINT	[ "/usr/bin/virtualbox" ]
diff --git a/znc/Dockerfile b/znc/Dockerfile
index 8af696f..54271ea 100644
--- a/znc/Dockerfile
+++ b/znc/Dockerfile
@@ -1,49 +1,49 @@
 # Run znc in a container
 #
 # docker run --restart always -d \
-#   --name znc \
-#   -p 6697:6697 \
-#   -v /volumes/znc:/home/user/.znc \
-#   jess/znc
+#	--name znc \
+#	-p 6697:6697 \
+#	-v /volumes/znc:/home/user/.znc \
+#	jess/znc
 #
 FROM debian:jessie
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    libdatetime-perl \
-    libglib2.0-0 \
-    libwww-perl \
-    perl \
-    && rm -rf /var/lib/apt/lists/*
+	ca-certificates \
+	curl \
+	libdatetime-perl \
+	libglib2.0-0 \
+	libwww-perl \
+	perl \
+	&& rm -rf /var/lib/apt/lists/*
 
 ENV HOME /home/user
 RUN useradd --create-home --home-dir $HOME user \
-    && chown -R user:user $HOME
+	&& chown -R user:user $HOME
 
 ENV LANG C.UTF-8
 
 ENV ZNC_VERSION 1.4
 
 RUN buildDeps=' \
-        build-essential \
-        libssl-dev \
-        libperl-dev \
-    ' \
-    && set -x \
-    && apt-get update && apt-get install -y $buildDeps --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/* \
-    && curl -sSL "http://znc.in/releases/znc-${ZNC_VERSION}.tar.gz" -o /tmp/znc.tar.gz \
-    && mkdir -p /usr/src/znc \
-    && tar -xzf /tmp/znc.tar.gz -C /usr/src/znc --strip-components 1 \
-    && rm /tmp/znc.tar.gz* \
-    && cd /usr/src/znc \
-    && ./configure \
-    && make -j8 \
-    && make install \
-    && rm -rf /usr/src/znc \
-    && apt-get purge -y --auto-remove $buildDeps
+		build-essential \
+		libssl-dev \
+		libperl-dev \
+	' \
+	&& set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& curl -sSL "http://znc.in/releases/znc-${ZNC_VERSION}.tar.gz" -o /tmp/znc.tar.gz \
+	&& mkdir -p /usr/src/znc \
+	&& tar -xzf /tmp/znc.tar.gz -C /usr/src/znc --strip-components 1 \
+	&& rm /tmp/znc.tar.gz* \
+	&& cd /usr/src/znc \
+	&& ./configure \
+	&& make -j8 \
+	&& make install \
+	&& rm -rf /usr/src/znc \
+	&& apt-get purge -y --auto-remove $buildDeps
 
 WORKDIR $HOME
 USER user