Started incorporating package code.
Merge branch 'master' of https://github.com/mizhi/dot-emacs