Merge commit 'rammstein/master'

diff --git a/shell/env.local b/shell/env.rammstein
similarity index 100%
rename from shell/env.local
rename to shell/env.rammstein

diff --git a/zsh/env.local b/zsh/host/env.rammstein
similarity index 100%
rename from zsh/env.local
rename to zsh/host/env.rammstein

diff --git a/zsh/rc.local b/zsh/host/rc.rammstein
similarity index 100%
rename from zsh/rc.local
rename to zsh/host/rc.rammstein