Add karma/phantomjs test to gruntfile
Simplify base grunt test:
Merge branch 'matt/upstream'