Some tweaks to make integration tests run.

Add master status get/update. Fix Master_Get_By_Name to return a master, rather than just its metadata
Merge pull request #7 from PopSugar/cp-fix-for-tests

Some tweaks to make integration tests run.