Minor updates
Merge branch 'master' of https://github.com/tomkrcha/generator-getting-started