Merge branch 'master' into 2.2.5

* master:
  In theory, no longer says note is "1 words."
  switched some calls from @jtamboli's pull request to literals
  formatting
  removing Deployment from repo
  Handle nil values for Simplenote-synced content, tags, systemTags
  building multiple release versions