add some date tests that are failng, remove tests for song stuff that came with Jasmine
minify sinonjs
fix conflicts