Various changes to make deployment clean
Apply patch to shock on deploy
Fixes to docs
Resolved Makefile conflicts in merge