Ember Router note on history api
Fix what I assume was a typo in the README

Probably inconsequential but hopefully helpful.
Merge pull request #127 from kgautreaux/patch-1

Fix what I assume was a typo in the README
Add commented greedy route matchers to Rails routes
Merge pull request #126 from dockyard/bc-location-history

Ember Router note on history api

Closes #120
Updated CHANGELOG
remove duplicate dependency on jquery-rails
Merge pull request #128 from frabrunelle/master

remove duplicate dependency on jquery-rails
Change scaffold to pass context to actions.
Merge pull request #129 from statik/use_this

Change scaffold to pass context to actions.
Make environment js files erb to enable reading values from ENV.
Merge pull request #130 from statik/config_erb

Make environment js files erb to enable reading values from ENV.
Fix README typo
Merge pull request #132 from tomdale/patch-1

Fix README typo
Update README.md

Minor typo correction
Merge pull request #133 from mfeckie/patch-1

Update README.md
Do not disallow non js assets
Asset paths may not be Strings

Asset paths can also be Pathnames which do not respond to start_with? directly.
Update custom config info.

`config.ember.appkit` does not longer exist.
Merge pull request #137 from abuiles/patch-1

Update custom config info.