Update runservers so that it works with current masters on all these branches
Merge pull request #4 from tidepool-org/kjq/update_rs

Update runservers so that it works with current masters -- went over this with Chris, and the key problem is solvable separately.
merge master