Add waits to fix spurious test failures
Centralize wait times and tweak them a bit
Log sandstorm.log output on failed tests
Fix possible timing issue in grain restart test
Update packages
Change to using randomized port for run-docker.sh
Merge pull request #139 from jparyani/fix-testing

Fix testing (for real this time)