Fix sixad
xubuntu + arabic_alias
Merge branch 'master' of https://github.com/tazjel/zdotfiles

Conflicts:
	1/.bashrc
	1/.config/.Xdefaults
	1/.config/.ackrc
	1/.config/.bashrc
	1/.config/.conkyrc
	1/.config/.ctags
	1/.config/.dir_colors
	1/.config/.easystroke/actions-0.5.6
	1/.config/.easystroke/preferences-0.5.5
	1/.config/.gemrc
	1/.config/.git_global_ignore
	1/.config/.gitmodules
	1/.config/.inputrc
	1/.config/.irbrc
	1/.config/.railsrc
	1/.config/.xinitrc
	1/.config/.zprofile
	1/.directory
	1/.inputrc
	1/.zsh/a
	1/.zsh/al.zsh
	1/.zsh/arabic_alias.zsh
	1/.zsh/exports.zsh
	1/dotfiles/.Xdefaults
	1/dotfiles/.ackrc
	1/dotfiles/.bashrc
	1/dotfiles/.conkyrc
	1/dotfiles/.ctags
	1/dotfiles/.dir_colors
	1/dotfiles/.easystroke/actions-0.5.6
	1/dotfiles/.easystroke/preferences-0.5.5
	1/dotfiles/.gemrc
	1/dotfiles/.git_global_ignore
	1/dotfiles/.gitmodules
	1/dotfiles/.inputrc
	1/dotfiles/.irbrc
	1/dotfiles/.railsrc
	1/dotfiles/.xinitrc
	1/dotfiles/.zprofile
	2/.vimrc.local
	2/zplugin/zabz.vim
	2/zplugin/zfunctionz.vim
	2/zplugin/zmapz.vim
	9/web2py/httpserver.log
	9/web2py/parameters_8000.py
	link/.Xdefaults
	link/.ackrc
	link/.bashrc
	link/.conkyrc
	link/.ctags
	link/.dir_colors
	link/.directory
	link/.easystroke/actions-0.5.6
	link/.easystroke/preferences-0.5.5
	link/.gemrc
	link/.git_global_ignore
	link/.gitmodules
	link/.inputrc
	link/.irbrc
	link/.railsrc
	link/.xinitrc
	link/.zprofile