Fixed bug that prevented .jshintrc from working after initial generation
Merge branch 'develop'
Release v2.1.1