todo's fixed a bit
added nirex test script
Merge pull request #6 from keflavich/master

A few more small updates