Merge pull request #78 from wfrench/master

Improved Preload
Changed assert_set_complete back to original, and fixed test_comm_config to include botpt.
Merge remote-tracking branch 'upstream/master'
Merge pull request #79 from deverett/master

Fixes for Broken Buildbot
Merge remote-tracking branch 'upstream/master'