updated gruntfile to have build and test definitions
Merge branch 'master' into gh-pages