Updating
Merge branch 'master' of github.com:nazgul42/dotemacs