Updated app to include grunt watch command to utilize grunt-nodemon task as a file watcher to auto-reload app.js on file changes
Upmerged with master.
Being more explicit about folder being watched.
Merged feature_issue-10. This will allow better development during partial inclusion.