added ls3 stuff to ssh/config
added squarez to config
added squarez to ssh/config
added squarez as bash-alias and to ssh-config
added parameter for wallpaper
var cip changes, might brake term trans again :-/
fixed dmenu_run_fast in cip
too much shit, will break for sure
revert term switch
Merge branch 'master' of ssh://uni/~/ciptmp/dotfiles

Conflicts:
	config/herbstluftwm/autostart
Merge branch 'master' of /home/cip/2009/el79irih/ciptmp/dotfiles

Conflicts:
	config/herbstluftwm/autostart
	ssh/config
fixed ssh/config merge
z61 ssh-key add in hlwm/autostart and nitrogen
added dmenu_path to z61 config
autostart hopefully fixed
Merge branch 'master' of ssh://uni/~/ciptmp/dotfiles

Conflicts:
	config/herbstluftwm/autostart
added rsyncpsa
added ls3 systems, and fixed lesspipe problem, by hiding errors
changed season to winter, fixed display.sh, and config
wallpaper.sh is just a workaround