Fix Some Nondeterministic failures

This was my attempt to address some of the nondeterministic build failures that we are seeing in Travis. The code is evolving fast enough that the issues weren't really helpful, and I'm not really certain what may have been causing the issues. I've added more error information.

I think I'm in favor of closing some of the older nondeterministic build failure issues. It's good to have a log of the nondeterministic failures that travis is spitting out, but if we don't get to them quickly they become very difficult to debug.