manual merge
el-get: add smex and org-mode