Merge branch 'master' into sampleApp
run npm test from grunt by default
Merge pull request #34 from Trott/sampleApp

Sample app