Sunday Fix

Applied Tim Lytle's fix as described here: https://github.com/twilio/OpenVBX/pull/235
Applied a handful of fixes and patches to reflect latest development