Updated Shock repo
Updated to latest Shock code.
Updated deployment to match new Shock codebase.