Trim non-allowed characters from the vocabulary's name.

#6659
![selection_121](https://cloud.githubusercontent.com/assets/1222368/4606253/58ea62e8-5216-11e4-9e11-38dcfc76f8d3.png)

We still need an upgrade path.