Merge branch 'hotfix/readme'
infinite loop by watch task
Merge branch 'hotfix/1.0.1' into develop

* hotfix/1.0.1:
  infinite loop by watch task
Merge branch 'develop' of github.com:svenpeeters/grunt-email-boilerplate into develop

* 'develop' of github.com:svenpeeters/grunt-email-boilerplate: