merged master into stargate
cleanup
cleanup
updated octopus to fix logging
merge from sholden stargate