ug-2815 fix build test due to concurrency, included old pr #273 & #274 from apigee/ug-stack
updated so auth is only included in call if a token is present, also cleaned up tests
reverted nodejs merge
Merge pull request #6 from rodsimpson/master

updated so auth is only included in call if a token is present, also cle...
ug-2722. return 400 with "File Not Found" when file is null when POST asset file via form
Merge pull request #7 from cywjackson/ug-2722

ug-2722. return 400 with "File Not Found" when file is null when POST null file
Merge pull request #8 from tonuquq/two-dot-o

Two dot o
For the sake of build-time, only test edge hash for a couple languages. Can we make the test configurable?
Some progress on PriamCluster. Still trying to get Priam to read it’s configuration properly.
Perfecting the change log test.
minor formatting
ug-2832: shutdown hector cluster on stopping tomcat
Added timestamp to the columns
ug-2389
Commit of refactor+tests
More progress on Priam: adding script to configure Priam via its SimpleDB config table.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
ug-2835: cleanup logging
Added some graph functionality and refactored some test-utils into collection.   Something is still wrong with the tests.
More progress on Priam, still not quite there.