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