Squashed commit of the following:

commit 244076ce44cda20643f112bf14189db41dd96821
Merge: f0f3ea4 304e93d
Author: Tang Ling <tangling.life@gmail.com>
Date:   Tue Dec 11 23:10:42 2012 -0500

    Merge branch 'windows-cfg' into tmep_linux_cfg

    Conflicts:
    	.emacs
    	install/install.bat

commit 304e93d6a950838f82b5675fbeeaa49b68fe1c7a
Author: Tang Ling <tangling.life@gmail.com>
Date:   Tue Dec 11 17:37:45 2012 +0800

    install/install.bat
       repair window installer on win7
    base-setting.el
       repare linum and max option

commit aa8415eb73c591a95060ffb85e8184b71ad4c3ca
Author: Tang Ling <tangling.life@gmail.com>
Date:   Mon Dec 10 20:07:20 2012 -0500

    delete org-mode docs from current branch

commit d69cee6e3457c0b5f8d9de3994f24fbaf083a422
Merge: 20478e4 5037735
Author: Tang Ling <tangling.life@gmail.com>
Date:   Mon Dec 10 19:24:24 2012 -0500

    Synchronized with remote repository

commit 20478e41b4ba8d96a12df5da51bdf16c578403e8
Author: Tang Ling <tangling.life@gmail.com>
Date:   Mon Dec 10 19:13:29 2012 -0500

    Synchronizing with remote repository

    commit b57e4e04d9a4b56e6ed4b36af401238411367009
    Merge: 31c7931 1b6b0fe
    Author: Tang Ling <tangling.life@gmail.com>
    Date:   Sun Dec 2 20:53:56 2012 +0800

        merge windows-cfg common settings

    commit 31c793106c714e14d6af7177810df3d4386f51a4
    Author: Tang Ling <tangling.life@gmail.com>
    Date:   Sun Dec 2 20:46:27 2012 +0800

        add .gitattributes

    commit 7a9a8d9b40b1243b9855a8035cc938deb4b8625d
    Author: tang ling <tangling.life@gmail.com>
    Date:   Thu Nov 29 17:42:14 2012 +0800

        add keybind ctrl + a to format source code

    commit ffafb17ec18801627a50bbc725f7c7e36b18c61d
    Author: Tang Ling <tangling.life@gmail.com>
    Date:   Wed Nov 28 22:11:59 2012 +0800

        Finish linux installation

    commit 0b595f110dd25f5c8c406fbe14e3cd97d45ba64a
    Author: tang ling <tangling.life@gmail.com>
    Date:   Wed Nov 28 17:42:41 2012 +0800

        Initial intall.sh

commit 5037735ea3fa017ad7be192a73aae7a8009ebb4b
Author: tang ling <tangling.life@gmail.com>
Date:   Mon Dec 10 17:50:49 2012 +0800

    repaired install.bat on windows 7

commit 9d790e274c9d9480e799bc0614d15db2d1555ff4
Author: tang ling <tangling.life@gmail.com>
Date:   Mon Dec 10 17:38:09 2012 +0800

    org-mode repaire

commit 2d9787119d5d1b76787114d4fce11642a10f8c4c
Merge: 01d80c2 13ee5c9
Author: tang ling <tangling.life@gmail.com>
Date:   Mon Dec 10 15:43:18 2012 +0800

    Merge remote-tracking branch 'origin/windows-cfg' into windows-cfg

commit 01d80c2afc59f7d05bc50bb06ca80406d0b22329
Author: tang ling <tangling.life@gmail.com>
Date:   Mon Dec 10 15:36:12 2012 +0800

    modified .emacs

commit 270a744bd1dae770f0a7df6452954970aade8787
Merge: 6834718 b57e4e0
Author: tang ling <tangling.life@gmail.com>
Date:   Mon Dec 10 15:31:04 2012 +0800

    Merge branch 'linux-cfg' of https://github.com/tangling/EmacsConfig into windows-cfg

commit 683471843685241971aadb2726a18d6d64abc525
Author: tang ling <tangling.life@gmail.com>
Date:   Fri Dec 7 18:00:14 2012 +0800

    add org-mode

commit 13ee5c9609f1ddc33a9948249d9cc91d18b33f63
Author: Tang Ling <tangling.life@gmail.com>
Date:   Sun Dec 2 20:55:22 2012 +0800

    .gitattributes is has not effect