Merge branch 'master' of github.com:reportgrid/client-libraries into JavaAPI

Conflicts:
	precog/java/src/test/java/com/precog/api/ClientTest.java
	precog/js/src/precog.js
	precog/js/test/index.html
	precog/js/test/tests.js
	precog/php/test/basetest.php
	precog/php/test/test-add-grant-to-account.php
	precog/php/test/test-add-grant-to-key.php
	precog/php/test/test-create-grant-child.php
	precog/php/test/test-create-grant.php
	precog/php/test/test-create-key.php
	precog/php/test/test-delete-grant.php
	precog/php/test/test-delete-key.php
	precog/php/test/test-describe-key.php
	precog/php/test/test-list-keys.php
	precog/php/test/test-retrieve-grants.php
	reportgrid/js/src/v1/reportgrid-charts.js
	reportgrid/js/src/v1/reportgrid-query.js