Merge branch 'master' of https://github.com/Dbroqua/home

# Conflicts:
#	zshrc

zshrc

@@ -80,6 +80,7 @@ zstyle ':completion:*:hosts' hosts $_ssh_config
 if [ -z "$SSH_AUTH_SOCK" ] ; then
     eval `ssh-agent -s`
     ssh-add ~/.ssh/id_rsa
+==== BASE ====
 fi
 
 # List of accounts to read the last tweet from, comma separated
@@ -111,3 +112,5 @@ export TTC_APIKEYS=true
 
 # Refresh the dashboard every 20 minutes.
 export TTC_UPDATE_INTERVAL=5
+
+rivalcfg --color=#509ADB -e steady