Replaced occurences of master/slave terminology
Merge pull request #16 from jshh/master

Replaced occurences of master/slave terminology