Merge pull request #1 from igutekunst/master

Made includes recursive
output filename options
merged local with isaac
fixed bugs with ifndef code, cleaned it up. all tests pass again
cleaned up use of globals
Merge https://github.com/ievans/tpypp into python_3

Also made some changes so this is compatibile with python 3. Seems to still work with 2.7
Conflicts:
	preprocessor.py