Hunting down improper usage of it's (where it should be its)
Merge branch 'master' of github.com:kalmanh/website into kalmanh-master

Conflicts:
	data/api.yml
	source/guides/testing/testing-components.md
	source/javascripts/vendor/ember-1.4.0.js
Merge branch 'kalmanh-master'

 merge conflicts from the 1.8.0 release