status model spec

Also deleted some unnecessary files and updated the .gitignore file.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	spec/dummy/db/test.sqlite3