Add .DS_Store to gitignore
Change Rspec format
Install Capybara
Change Rspec-mocks gem version
Add feature, views and controller specs for terms
Merge branch 'test'

Conflicts:
	.gitignore
	.rspec
	Gemfile