"grunt" now runs and restarts the app on 3000. "grunt watch" runs the app on 3500 and then the tests then shuts down.
Merge remote-tracking branch 'origin/master'