Updates based on the comments to https://github.com/GoogleChrome/chrome-app-samples/pull/111
Merge branch 'master' of https://github.com/fgorski/chrome-app-samples
Reverting the tasks portion as they are not part of this pull request