Merge branch 'master' of github.com:tungd/dotfiles

Conflicts:
	emacs/init.el
	shell/init.sh