Squashed commit of the following:

commit a8cd549c7a8afdc5b778f83502f2db502c3c9aea
Author: Tang Ling <tangling.life@gmail.com>
Date:   Sat Jan 5 17:55:53 2013 +0800

    modified org-mode settings

commit 2b44ea870aa42357771860739549ff485c14532c
Author: Tang Ling <tangling.life@gmail.com>
Date:   Sat Jan 5 13:21:02 2013 +0800

    org-mode setting, add pymacs

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

    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
Merge branch 'windows-cfg' of github.com:tangling/EmacsConfig into windows-cfg