Changes for Heroku integration (build api from token)
Fix usage of storage path
Merge branch 'master' of github.com:reportgrid/client-libraries into topic/heroku
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
Merge branch 'master' of github.com:gclaramunt/client-libraries into topic/ruby_update
Merge remote-tracking branch 'origin/topic/heroku'
Update precog.rb

Fix weird block issue
Changes to ruby library to make compatible with Ruby 1.8.7
update for v2 ingest
Revert php basetest to devapi and add state id for geochart
Fix ingest
typo fix
moved name inside properties to be accessible
Fixed ingest parameteres
Update csv ingest test
Merge branch 'master' of github.com:reportgrid/client-libraries into topic/ruby_update

Conflicts:
	precog/ruby/lib/precog.rb
removed trailing slash from describe account
adds asyncQuery and asyncQueryResults
added default timout for asyncQuery of 30 minutes
corrected default timeout and added basepath as default prefix path