diff --git a/asound.conf b/asound.conf.bak
similarity index 100%
rename from asound.conf
rename to asound.conf.bak
diff --git a/conf.d/._cfg0000_hddtemp b/conf.d/._cfg0000_hddtemp
deleted file mode 100644
index b60b0f3..0000000
--- a/conf.d/._cfg0000_hddtemp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# the hddtemp executable
-HDDTEMP_EXEC=/usr/sbin/hddtemp
-
-# various options to pass to the daemon
-HDDTEMP_OPTS="--listen=127.0.0.1"
-
-# a list of drives to check
-HDDTEMP_DRIVES="/dev/sda /dev/sdb"
-
diff --git a/conf.d/hddtemp b/conf.d/hddtemp
index 55fc62d..b60b0f3 100644
--- a/conf.d/hddtemp
+++ b/conf.d/hddtemp
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/files/hddtemp-conf.d,v 1.4 2012/03/16 14:25:14 aidecoe Exp $
+# $Id$
 
 # the hddtemp executable
 HDDTEMP_EXEC=/usr/sbin/hddtemp
diff --git a/init.d/._cfg0000_git-daemon b/init.d/._cfg0000_git-daemon
deleted file mode 100755
index b6ecfd9..0000000
--- a/init.d/._cfg0000_git-daemon
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-pidfile="/var/run/git-daemon.pid"
-command="/usr/bin/git"
-command_args="daemon ${GITDAEMON_OPTS}"
-start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
-
-depend() {
-	use logger
-}
diff --git a/init.d/._cfg0000_hddtemp b/init.d/._cfg0000_hddtemp
deleted file mode 100755
index 60b1e31..0000000
--- a/init.d/._cfg0000_hddtemp
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting hddtemp daemon"
-	/sbin/start-stop-daemon --start --quiet --exec ${HDDTEMP_EXEC} \
-	-- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping hddtemp daemon"
-	start-stop-daemon --stop --quiet --exec ${HDDTEMP_EXEC}
-	eend $?
-}
-
-
diff --git a/init.d/._cfg0000_minetest-server b/init.d/._cfg0000_minetest-server
deleted file mode 100755
index e0a33d9..0000000
--- a/init.d/._cfg0000_minetest-server
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-description="Minetest dedicated server"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "starting server"
-	start-stop-daemon \
-		--start \
-		--quiet \
-		--make-pidfile \
-		--pidfile "${PIDFILE}" \
-		--background \
-		--user ${USER} \
-		--group ${GROUP} \
-		--exec "${MINETESTBIN}" -- ${ARGS}
-
-	eend $?
-}
-
-stop() {
-	ebegin "stopping server"
-	start-stop-daemon \
-		--stop \
-		--signal 15 \
-		--quiet \
-		--pidfile "${PIDFILE}"
-
-	eend $?
-}
diff --git a/init.d/git-daemon b/init.d/git-daemon
index ee9a64e..b6ecfd9 100755
--- a/init.d/git-daemon
+++ b/init.d/git-daemon
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.4 2014/03/03 19:21:29 polynomial-c Exp $
+# $Id$
 
 pidfile="/var/run/git-daemon.pid"
 command="/usr/bin/git"
diff --git a/init.d/hddtemp b/init.d/hddtemp
index 414a672..60b1e31 100755
--- a/init.d/hddtemp
+++ b/init.d/hddtemp
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/files/hddtemp-init,v 1.7 2012/10/24 18:45:04 aidecoe Exp $
+# $Id$
 
 depend() {
 	need localmount
diff --git a/init.d/minetest-server b/init.d/minetest-server
index 88bfba9..e0a33d9 100755
--- a/init.d/minetest-server
+++ b/init.d/minetest-server
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $
 
 description="Minetest dedicated server"
 
diff --git a/paludis/hooks/ebuild_postinst_post/pulseaudio_no_exec.bash b/paludis/hooks/ebuild_postinst_post/pulseaudio_no_exec.bash
index 59f6a07..8f8dae1 100755
--- a/paludis/hooks/ebuild_postinst_post/pulseaudio_no_exec.bash
+++ b/paludis/hooks/ebuild_postinst_post/pulseaudio_no_exec.bash
@@ -4,8 +4,8 @@ source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
 
 # e.g. use for ns2
 
-if [[ "${CATEGORY}/${PN}" == "media-sound/pulseaudio" ]] ; then
-	einfo "removing executable bit from '/usr/bin/pulseaudio!'" 
-	chmod -x /usr/bin/pulseaudio
-fi
+#if [[ "${CATEGORY}/${PN}" == "media-sound/pulseaudio" ]] ; then
+#	einfo "removing executable bit from '/usr/bin/pulseaudio!'" 
+#	chmod -x /usr/bin/pulseaudio
+#fi
 
diff --git a/paludis/use.conf.d/pulseaudio.conf b/paludis/use.conf.d/pulseaudio.conf
index e03d9d3..420259d 100644
--- a/paludis/use.conf.d/pulseaudio.conf
+++ b/paludis/use.conf.d/pulseaudio.conf
@@ -1,2 +1,3 @@
 media-sound/pulseaudio gnome
 media-plugins/alsa-plugins pulseaudio
+*/* pulseaudio
diff --git a/vim/._cfg0000_gvimrc b/vim/._cfg0000_gvimrc
deleted file mode 100644
index 8dc461a..0000000
--- a/vim/._cfg0000_gvimrc
+++ /dev/null
@@ -1,29 +0,0 @@
-scriptencoding utf-8
-" ^^ Please leave the above line at the start of the file.
-
-" Default configuration file for gvim
-" $Id$
-"
-" Written by Aron Griffis <agriffis@gentoo.org>
-"
-" This file is read AFTER normal Vim initializations, like reading your .vimrc
-" file (and the default /usr/share/vim/vimrc).  So there's no reason to
-" duplicate settings from vimrc.  Red Hat has had this wrong for years, to the
-" great annoyance of users.
-
-" Pre-GUI settings
-set columns=80 lines=30       " don't inherit geometry from parent term
-set mousemodel=popup          " right mouse button pops up a menu in the GUI
-
-" Use a sufficiently wide window automatically when started as "gvimdiff"
-if (&foldmethod == 'diff')
-	set columns=165
-endif
-
-" For bug 33327, add a mapping which allows shift-insert to function
-" as expected in insert and command-line modes
-map! <s-insert> <c-r>*
-
-if filereadable("/etc/vim/gvimrc.local")
-  source /etc/vim/gvimrc.local
-endif
diff --git a/vim/gvimrc b/vim/gvimrc
index b1c2ff1..8dc461a 100644
--- a/vim/gvimrc
+++ b/vim/gvimrc
@@ -2,7 +2,7 @@ scriptencoding utf-8
 " ^^ Please leave the above line at the start of the file.
 
 " Default configuration file for gvim
-" $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/files/gvimrc-r1,v 1.2 2010/04/15 19:49:14 darkside Exp $
+" $Id$
 "
 " Written by Aron Griffis <agriffis@gentoo.org>
 "