Deprecate "delim" argument in favor of "delimiter"

This makes the argument more user-friendly and intuitive.

This pull request also makes the following changes to code exclusive to
the 2014.7 branch:

- The ``delim`` argument in both ``pillar.get`` and ``grains.get`` has
  been renamed to ``delimiter``.
- Misspelled salt-ssh CLI argument ``--delimeter`` has been corrected to
  ``--delimiter``.