Upgrading rails to 4.1.1 with bundle update
Updating RSPEC results
Merge branch 'master' into moremodels

Conflicts:
	.rspec_results.txt