Removed swp file.
Removed quotes on some keys for consistency.
Updated examples to be more clear.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Updated examples to be more clear.
  Removed quotes on some keys for consistency.
  Removed swp file.