#55 adding better '_' support after actually using my work

after using my very naive fix, I ran into issues. I have fixed it I believe.

This is working quite well at Dovetail (everything is green) and we have a mixed environment of test files w/ and w/o spaces.

I tried to be very careful about where I changed the tests and and introduced a method to help hide the space -> underscore conversion.