update
updated
Merge branch 'master' of github.com:jikk/emacs.d

Conflicts:
	etc/smount.sh