Setting Xft.dpi to 96.
Zizek-specific modifications.
Added admin alias.
Reorganizing bashrc.
Merge remote-tracking branch 'origin/zizek'

Conflicts:
	xinitrc
Merge branch 'master' into sd

Conflicts:
	bashrc_local