Merge branch 'develop'

* develop:
  Update .rspec template and remove rspec from gitignore
Update HISTORY