Revert "Pull from master"

Reverts pivotalservices/bosh#1  since I should do this locally then push to pivotalservices branch