log xscreensaver
some changes

1. comment out distro_name: because some machine won't work

2. if open x window, auto change the keymap

3. add a comment for how to change keyboardmap in shell
use default desktop
turn on cjkwidth
remove some auto-start applications when open a X window
add a keymap for swap Ctrl and CapsLock
Merge branch 'master' of github.com:M157q/rcfiles

Conflicts:
	bashrc