added grunt-qunit for better local testing with phantomjs
Merge remote-tracking branch 'origin/master'