lots of changes.
cleaning up tests and adding jasmine-2.0