diff --git a/bootstrapvz/plugins/admin_user/__init__.py b/bootstrapvz/plugins/admin_user/__init__.py
index d9a5466..7202f2e 100644
--- a/bootstrapvz/plugins/admin_user/__init__.py
+++ b/bootstrapvz/plugins/admin_user/__init__.py
@@ -11,7 +11,7 @@ def validate_manifest(data, validator, error):
 
 
 def resolve_tasks(taskset, manifest):
-        import logging
+	import logging
 	import tasks
 	from bootstrapvz.common.tasks import ssh
 
diff --git a/bootstrapvz/plugins/ansible/tasks.py b/bootstrapvz/plugins/ansible/tasks.py
index 4dd675d..f2b6518 100644
--- a/bootstrapvz/plugins/ansible/tasks.py
+++ b/bootstrapvz/plugins/ansible/tasks.py
@@ -66,13 +66,13 @@ class RunAnsiblePlaybook(Task):
         inventory = os.path.join(info.root, 'tmp/bootstrap-inventory')
         with open(inventory, 'w') as handle:
             conn = '{} ansible_connection=chroot'.format(info.root)
-	    content = ""
+            content = ""
 
-    	    if hosts:
+            if hosts:
                 for host in hosts:
                     content += '[{}]\n{}\n'.format(host, conn)
-	    else:
-		content = conn
+            else:
+                content = conn
 
             handle.write(content)
 
diff --git a/bootstrapvz/plugins/docker_daemon/__init__.py b/bootstrapvz/plugins/docker_daemon/__init__.py
index 3a72b6b..11a314b 100644
--- a/bootstrapvz/plugins/docker_daemon/__init__.py
+++ b/bootstrapvz/plugins/docker_daemon/__init__.py
@@ -23,5 +23,5 @@ def resolve_tasks(taskset, manifest):
 	taskset.add(tasks.AddDockerBinary)
 	taskset.add(tasks.AddDockerInit)
 	taskset.add(tasks.EnableMemoryCgroup)
-        if len(manifest.plugins['docker_daemon'].get('pull_images', [])) > 0:
-                taskset.add(tasks.PullDockerImages)
+	if len(manifest.plugins['docker_daemon'].get('pull_images', [])) > 0:
+		taskset.add(tasks.PullDockerImages)
diff --git a/bootstrapvz/providers/ec2/assets/bin/growpart b/bootstrapvz/providers/ec2/assets/bin/growpart
index 85c2d1f..eedcc32 100755
--- a/bootstrapvz/providers/ec2/assets/bin/growpart
+++ b/bootstrapvz/providers/ec2/assets/bin/growpart
@@ -98,7 +98,7 @@ mktemp_d() {
 	_RET=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX" 2>/dev/null) &&
 		return
 	_RET=$(umask 077 && t="${TMPDIR:-/tmp}/${0##*/}.$$" &&
-		mkdir "${t}" &&	echo "${t}")
+		mkdir "${t}" && echo "${t}")
 	return
 }
 
@@ -428,7 +428,7 @@ rq() {
 	fi
 	if [ $ret -ne 0 ]; then
 		error "failed [$label:$ret]" "$@"
- 		cat "$efile" 1>&2
+		cat "$efile" 1>&2
 	fi
 	return $ret
 }
@@ -443,7 +443,7 @@ verify_ptupdate() {
 
 	# we can always satisfy 'off'
 	if [ "$input" = "off" ]; then
- 		_RET="false";
+		_RET="false";
 		return 0;
 	fi
 
diff --git a/bootstrapvz/providers/ec2/tasks/filesystem.py b/bootstrapvz/providers/ec2/tasks/filesystem.py
index 3e3dce4..2c0b19f 100644
--- a/bootstrapvz/providers/ec2/tasks/filesystem.py
+++ b/bootstrapvz/providers/ec2/tasks/filesystem.py
@@ -15,7 +15,7 @@ class S3FStab(Task):
 		mount_opts = ['defaults']
 		fstab_lines.append('{device_path}{idx} {mountpoint} {filesystem} {mount_opts} {dump} {pass_num}'
 		                   .format(device_path='/dev/xvda',
-		                   	       idx=1,
+		                           idx=1,
 		                           mountpoint='/',
 		                           filesystem=root.filesystem,
 		                           mount_opts=','.join(mount_opts),
diff --git a/bootstrapvz/providers/ec2/tasks/network.py b/bootstrapvz/providers/ec2/tasks/network.py
index af5a551..91749b4 100644
--- a/bootstrapvz/providers/ec2/tasks/network.py
+++ b/bootstrapvz/providers/ec2/tasks/network.py
@@ -54,7 +54,7 @@ class InstallNetworkingUDevHotplugAndDHCPSubinterface(Task):
 		from shutil import copy
 		copy(os.path.join(script_src, '53-ec2-network-interfaces.rules'),
 		     os.path.join(script_dst, 'udev/rules.d/53-ec2-network-interfaces.rules'))
-                os.chmod(os.path.join(script_dst, 'udev/rules.d/53-ec2-network-interfaces.rules'), rwxr_xr_x)
+		os.chmod(os.path.join(script_dst, 'udev/rules.d/53-ec2-network-interfaces.rules'), rwxr_xr_x)
 
 		os.mkdir(os.path.join(script_dst, 'sysconfig'), 0755)
 		os.mkdir(os.path.join(script_dst, 'sysconfig/network-scripts'), 0755)
diff --git a/bootstrapvz/providers/gce/tasks/image.py b/bootstrapvz/providers/gce/tasks/image.py
index 777e6d1..a6c53fc 100644
--- a/bootstrapvz/providers/gce/tasks/image.py
+++ b/bootstrapvz/providers/gce/tasks/image.py
@@ -22,7 +22,7 @@ class CreateTarball(Task):
 		tarball_path = os.path.join(info.manifest.bootstrapper['workspace'], tarball_name)
 		info._gce['tarball_name'] = tarball_name
 		info._gce['tarball_path'] = tarball_path
-                # GCE requires that the file in the tar be named disk.raw, hence the transform
+		# GCE requires that the file in the tar be named disk.raw, hence the transform
 		log_check_call(['tar', '--sparse', '-C', info.manifest.bootstrapper['workspace'],
 		                '-caf', tarball_path,
 		                '--transform=s|.*|disk.raw|',
diff --git a/bootstrapvz/providers/virtualbox/tasks/guest_additions.py b/bootstrapvz/providers/virtualbox/tasks/guest_additions.py
index 350ce4a..ac69607 100644
--- a/bootstrapvz/providers/virtualbox/tasks/guest_additions.py
+++ b/bootstrapvz/providers/virtualbox/tasks/guest_additions.py
@@ -67,10 +67,10 @@ class InstallGuestAdditions(Task):
 		install_script = os.path.join('/', mount_dir, 'VBoxLinuxAdditions.run')
 		install_wrapper_name = 'install_guest_additions.sh'
 		install_wrapper = open(os.path.join(assets, install_wrapper_name)) \
-                        .read() \
-                        .replace("KERNEL_VERSION", kernel_version) \
-                        .replace("KERNEL_ARCH", info.kernel['arch']) \
-                        .replace("INSTALL_SCRIPT", install_script)
+			.read() \
+			.replace("KERNEL_VERSION", kernel_version) \
+			.replace("KERNEL_ARCH", info.kernel['arch']) \
+			.replace("INSTALL_SCRIPT", install_script)
 		install_wrapper_path = os.path.join(info.root, install_wrapper_name)
 		with open(install_wrapper_path, 'w') as f:
 			f.write(install_wrapper + '\n')
diff --git a/docs/_static/taskoverview.coffee b/docs/_static/taskoverview.coffee
index f4e1f25..3bd1fd9 100644
--- a/docs/_static/taskoverview.coffee
+++ b/docs/_static/taskoverview.coffee
@@ -38,8 +38,8 @@ class window.TaskOverview
 		arrow = definitions.append('marker')
 		arrow.attr('id', 'right-arrowhead')
 			.attr('refX', arrowHeight = 4)
-			.attr('refY', 	(arrowWidth = 6) / 2)
-			.attr('markerWidth', 	arrowHeight)
+			.attr('refY', (arrowWidth = 6) / 2)
+			.attr('markerWidth', arrowHeight)
 			.attr('markerHeight', arrowWidth)
 			.attr('orient', 'auto')
 		  .append('path').attr('d', "M0,0 V#{arrowWidth} L#{arrowHeight},#{arrowWidth/2} Z")
diff --git a/manifests/README.rst b/manifests/README.rst
index 4771106..bc37a75 100644
--- a/manifests/README.rst
+++ b/manifests/README.rst
@@ -249,9 +249,9 @@ Example:
         - /root/keys/puppet.gpg
       apt.conf.d:
         00InstallRecommends: >-
-	  APT::Install-Recommends "false";
-	  APT::Install-Suggests   "false";
-	00IPv4: 'Acquire::ForceIPv4 "false";'
+          APT::Install-Recommends "false";
+          APT::Install-Suggests   "false";
+        00IPv4: 'Acquire::ForceIPv4 "false";'
       preferences:
         main:
           - package: *