Update manifest for PyPI.

MANIFEST.in

@@ -1,63 +1,17 @@
-<<<<<<< HEAD
 include Readme.txt
-include dev_notes.txt
-include HISTORY.TXT
-include LICENSE.txt
-include TODO.txt
+include doc_src\*.txt
+include LICENSE
 include setup.cfg
 include setup.py
 
-
-include pywinauto
 include pywinauto\controls\*.py
 include pywinauto\tests\*.py
 include pywinauto\unittests\*.py
-exclude pywinauto\.svn\*
 
 # include the examples - but not Watsup or .svn directories
-include pywinauto\examples\*.pkl
 include examples\*.py
-include examples\*.txt
-exclude examples\.svn\README.txt
-exclude examples\examples_watsup\*.*
+exclude examples\examples_watsup\*.py
 
 # include all the website folder and make sure that
 # the sub version files are not included
-include docs\*.*
-exclude docs\.svn\*
-exclude docs\pywinauto\.svn\*
-exclude docs\pywinauto\controls\.svn\*
-exclude docs\pywinauto\tests\.svn\*
-exclude docs\.doctrees\*
-=======
-include Readme.txt
-include dev_notes.txt
-include HISTORY.TXT
-include LICENSE.txt
-include TODO.txt
-include setup.cfg
-include setup.py
-
-
-include pywinauto
-include pywinauto\controls\*.py
-include pywinauto\tests\*.py
-include pywinauto\unittests\*.py
-exclude pywinauto\.svn\*
-
-# include the examples - but not Watsup or .svn directories
-include pywinauto\examples\*.pkl
-include examples\*.py
-include examples\*.txt
-exclude examples\.svn\README.txt
-exclude examples\examples_watsup\*.*
-
-# include all the website folder and make sure that
-# the sub version files are not included
-include docs\*.*
-exclude docs\.svn\*
-exclude docs\pywinauto\.svn\*
-exclude docs\pywinauto\controls\.svn\*
-exclude docs\pywinauto\tests\.svn\*
-exclude docs\.doctrees\*
->>>>>>> pywinauto64master
+exclude pywinauto\docs\.doctrees\*