Added spork-rails to make testing quicker

Conflicts:
	spec/spec_helper.rb
Added instructions for testing
Merge branch 'master' of https://github.com/mconf/mconf-web