Updated the tests to check that original optiosn were still being paid attention to
Moved typecasting to its own module

Removed browser-compatability code, browserify is now required
Fixed unfinished merge