minor syntax fixes
update to jasmine 2.0 spies
translate waits into setTimeout functions for jasmine 2.0