Update README.md
Gemfile.lock
Merge branch 'develop'

* develop:
  Start debugging context-dependent spec failures
Add specs to make sure consecutive runs of the generator behave correctly
Merge branch 'hotfix/1.2.0' into develop