adds tests, removed errant debug things in Options.php and script, still need more tests
Merge pull request #50 from kevinquinnyo/tests-and-cleanup

adds tests, removed errant debug things in Options.php and script, still...