updating code to work with gnuradio pre-release 3.7
grc updates for 3.7
Merge pull request #1 from osh/master

updates for 3.7