Get some stuff started
Fix preprocessing and tests
Merge pull request #2 from gjtorikian/preprocessor-flagging

Preprocessor flagging