Merge branch 'master' of https://github.com/whatevsz/dotfiles

Conflicts:
	mpd/mpd/mpd.conf

mpd/mpd/mpd.conf

@@ -47,7 +47,7 @@ pid_file			"~/.var/run/mpd.pid"
 # it was brought down. This setting is disabled by default and the server
 # state will be reset on server start up.
 #
-#state_file			"~/.mpd/state"
+state_file			"~/.var/local/mpd.state"
 #
 # The location of the sticker database.  This is a database which
 # manages dynamic information attached to songs.
@@ -78,7 +78,7 @@ pid_file			"~/.var/run/mpd.pid"
 # This setting can deny access to control of the daemon.
 #
 # For network
-#bind_to_address		"any"
+bind_to_address		"any"
 #
 # And for Unix Socket
 #bind_to_address		"~/.mpd/socket"
@@ -106,7 +106,7 @@ gapless_mp3_playback			"yes"
 # Setting "restore_paused" to "yes" puts MPD into pause mode instead
 # of starting playback after startup.
 #
-restore_paused "no"
+restore_paused "yes"
 #
 # This setting enables MPD to create playlists in a format usable by other
 # music players.
@@ -363,7 +363,7 @@ replaygain			"auto"
 # above its original level. If replaygain_limit is disabled such amplification
 # might occur. By default this setting is enabled.
 #
-#replaygain_limit		"yes"
+replaygain_limit		"yes"
 #
 # This setting enables on-the-fly normalization volume adjustment. This will
 # result in the volume of all playing audio to be adjusted so the output has