removed stuff Ember.setupForTesting does automatically
Merge pull request #516 from crismali/cleanup-testing-setup

removed stuff Ember.setupForTesting does automatically
Reflect changes from #516.
Merge pull request #522 from abuiles/update-changelog

Reflect changes from #516.
refactored the test loader to iterate once and be a bit more readable
Update loom-generators-ember-appkit to `^1.1.1`.
Added support for ember-script preprocessing
Update CHANGELOG guidelines.
Merge pull request #527 from abuiles/document-changelog-prefix

Update CHANGELOG guidelines.
Updated changelog
Merge pull request #525 from abuiles/update-loom-generators-appkit

Update loom-generators-ember-appkit to `^1.1.1`.
update changelog to reflect test-loader.js refactor
Merge pull request #524 from crismali/refactor-test-loader

refactored the test loader to iterate once and be a bit more readable
Changelog to match proper style
Merge remote-tracking branch 'upstream/master' into feature/ember-script-support

Conflicts:
	CHANGELOG.md
Merge pull request #526 from rtablada/feature/ember-script-support

Added support for ember-script preprocessing
Add ic-ajax to whitelist for testing.
Allow 0.10.0 failures.

See #534 for the 0.10.0 reasoning.

Also, I changed to use `0.10` and `0.11` instead of the specific
versions as recommended by the Travis folks. This will give use the
latest version in that series provided by the Travis VM (and is likely
what we want anyways).
Merge pull request #535 from rjackson/handle-0-10-0-failures

Allow 0.10.0 failures.
Merge pull request #533 from rjackson/allow-ic-ajax

Add ic-ajax to whitelist for testing.