Fixing bad regex for signal_data
Cleaning up code in a couple other places
Merge pull request #9 from daviddavis/master

Fixing bad regex