Do not use <base> tag for none or hash.
Install phantomjs when testing with master
phantomjs is needed by default going forward
Merge pull request #602 from dustinfarris/testing-with-master

Mention PhantomJS requirement for testing
Revert "phantomjs is needed by default going forward"

This reverts commit 6800ee37496428b47b5a723b4fee61c792c8bc12.
This reverts commit 12ea16de34c314f86b8c45baaec4401d3d3412b9.
remove the proxy-host and proxy-port, introduce proxy-url instead
rename proxy-url to proxy
add changelog entry
fix changelog entry
add cli param test
remove duplicate assertions
add serve proxy test, add express server test
Merge pull request #500 from rjackson/dont-use-base-tag-for-none-or-hash

Do not use <base> tag for none or hash.
Document upgrading apps linked to master

Make upgrade instructions more concise

Get rid of extra newline

Fix typo

Small edit: specify in project dir
Merge pull request #610 from sohara/document_upgrade_master

Document upgrading apps linked to master
Update broccoli-jshint.

Updated version looks into the root of the input tree for the jshintrc.
Do not globally ignore `require` and `requirejs` for tests.
Merge pull request #618 from rjackson/update-jshint

Update broccoli-jshint.
Merge pull request #619 from rjackson/dont-allow-require

Do not globally ignore `require` and `requirejs` for tests.
Require rimraf 2.2.8.

See https://github.com/isaacs/rimraf/commit/1b612ed9370b5a3d0de9bb0ba1a32ea1dc8edba1 for details.