i.e. = that is, e.g. = for example
Merge pull request #1054 from Trott/ie-vs-eg

i.e. = that is, e.g. = for example
Ember: Soft-upgrade 1.6 dependencies