Merge pull request #589 from teharrison/shock

public button makes shock nodes public; removed depricated modules