Adding grunt support and a default task that runs PHPUnit tests
Merge branch 'develop' into php-53-compat

* develop:
  Adding grunt support and a default task that runs PHPUnit tests