relative path fix in prepreocessors.js
Provide a --watcher option to allow the user to specify which watcher to use
Use poll flag for sane instead of switching between watchers
Update changelog
Smoke Test Refactor
Merge pull request #970 from jlauemoeller/master

Provide a --watcher option to allow the user to specify watcher to use
Merge pull request #973 from rjackson/smoke-test-refactor

Smoke Test Refactor
improve conditional
inflection should not be a a depedency not a dev dependency
Add link for #970 to CHANGELOG.
Merge pull request #968 from csantero/preprocessCss-fix

relative path fix in preprocessors.js
update broccoli-sane-watcher to 0.0.5. It now should provided better
errors when trying to watching something non-existent
[fixes ] update es3 filter to v0.0.7

- it now uses the same esprima as the module transpiler, so it should
  work on all versions of esprima that it does.
- due to ^^ we can now re-introduce one at a time semantics for this
  transpile step (faster incremental builds)

Signed-off-by: Stefan Penner <stefan.penner@gmail.com>
Merge pull request #978 from stefanpenner/es6-safe-recast-fast

[fixes ] update es3 filter to v0.0.7
Fix whitespace.
Add missing CHANGELOG entries.
Do not wrap vendor in eval when `wrapInEval` is set.
Merge pull request #983 from rjackson/do-not-wrap-vendor-in-eval

Do not wrap vendor in eval when `wrapInEval` is set.
Add Brocfile test for `wrapInEval`.
Merge pull request #984 from rjackson/add-wrap-in-eval-test

Add Brocfile test for `wrapInEval`.