Switch to grunt-contrib-watch
default to nospawn
Merge branch 'master' into grunt-contrib-watch

* master: (23 commits)
  0.13.0
  add quotes around paths
  Upgrade all the things. See #117
  0.12.5
  Upgrade jasmine-given
  Add link to 'Using Ember.js with Qunit' to README.md
  0.12.4
  update jasmine-stealth
  0.12.3
  Augments app.routes to insert bodyParser - this approach leaves apiProxy'd endpoints alone, and prevents issues with the bodyParser messing up proxy'd endpoints - this allows both proxy'd and stubbed endpoints to exist and operate in harmony :)
  0.12.2
  Fix bodyParser() by drawing routes in configure()
  wtfdebuggershowdotheyworklolbbq
  fixes #46 (finally!)
  0.12.1
  adds js+css to the default pages template context
  Fix the note in the readme
  0.12.0
  Implements a nifty `config` reader
  Print out help if the user only enters `lineman`
  ...

Conflicts:
	package.json
update to latest grunt-contrib-watch (0.5.3)
Merge branch 'master' into grunt-contrib-watch

* master:
  0.14.4
  Well that was dumb. Fixes #122
  now with 75% more existential operator. ?!
  move the guard clause up, kill the unnecessary ()s
  Don't abort if we're using a git version
  Adding access to HTTP server for server.js
  0.14.3
  Upgrade jasmine-given a lot.
  0.14.2
  compress w/ gzip for faster dev perf
  0.14.1
  inheriting process stdios shows output, exits quickly and fails correctly if tests fail
  spawn and ignore stdio
  0.14.0
  Fixes "spec" task under Windows (Vista+)
  Fixes "spec-ci" task under Windows (Vista+)
  0.13.1
  export fileUtils. they're just too useful
  move lineman to devDependencies
Merge branch 'grunt-contrib-watch'

* grunt-contrib-watch:
  update to latest grunt-contrib-watch (0.5.3)
  default to nospawn
  Switch to grunt-contrib-watch