Allowed ``~`` to be a safe character.
Merge branch 'kyleknap-develop' into develop

* kyleknap-develop:
  Allowed ``~`` to be a safe character.