Some bug fixes
Merging
Merge branch 'v1.0-beta' of github.com:pvenkatakrishnan/generator-kraken into v1.0-beta