returned gr-blocks and gr-digital to previous files and resolved example conflicts in gr-trellis