Easy-to-Merge

## Easy to Merge

This branch collects PRs that are easy to merge, like fixing typos and such. If you want to add a commit, please [submit a PR](https://github.com/ncanceill/oh-my-zsh/pull/new/easymerge) to [my branch](https://github.com/ncanceill/oh-my-zsh/tree/easymerge).

### Status

Collecting more and more PRs before merging. Please help.

This is the second Easy-to-Merge PR: see #2827

### Changelog

* Fixes #1220
* Fixes #2108
* Fixes #2382 ([again](https://github.com/robbyrussell/oh-my-zsh/pull/2382#issuecomment-47633419))
* Fixes #2670
* Fixes #2745, fixes #2157
* Fixes #2749
* Fixes #2828
* Fixes #2834
* Fixes #2845
* ~~Fixes~~ **NOT** #2885 (see #2923)
* Fixes #2935
* Fixes #2952, fixes #2953