add zencoding-mode
Merge remote-tracking branch 'origin/master'

Conflicts:
	emacs/conf/00-init.el
タブとウィンドウの切り替えキー追加
Merge remote-tracking branch 'origin/master'

Conflicts:
	emacs/conf/00-init.el
	emacs/conf/99-key.el