Merge.
Due to my schizophrenia, I've accidentally forked my own code. The other set of changes were found in another computer.
.*~$
^tuikit/.*\.pyc$
^tuikit\.conf$
^docs/_build
tuikit\.log
^build
^sdlterm/build
^sdlterm/font
^sdlterm/cython/sdlterm.cpp$
^sdlterm/test_
^(.*/)?\.c?project$
^(.*/)?\.pydevproject$
^\.settings
^\.idea/
^\.ackrc$
.*\.appstats
__pycache__