Fixing exceptions from chai. Adding comments to what the fixes were and why.
Making code prettier and less confusing in behavior
Merge pull request #2 from kloy/master

Fixing all exceptions and cleaning up code to be more obvious in behavior