added hard-coded white-list for conductor computers
Merge branch 'master' of github.com:AJFaraday/scaled_up