Squashed commit of the following:

commit 21d5bef1e4852a6a69850546bad36ac7d8bff0ca
Author: Tang Ling <tangling.life@gmail.com>
Date:   Tue Dec 25 12:24:05 2012 +0800

    Conflicts:
    	.emacs
    	my-site-lisps/settings/color-themes-setting.el
org-mode setting, add pymacs