replaced _ with - in style string output, need to remember to replace - with _ when the string is passed in as input.
Merge branch 'testbed' of github.com:brandonmayer/sci-wms into testbed