merge w master
upgraded to jasmine 2.0 with newer grunt-contrib-jasmine stack