Serverspec + and droned opts fixes

Includes #12