Correct typos
Temporary modification of .gitattributes in order to pull the rails-3.2 branch without line endings getting in the way
Fix merge conflict in .gitattributes
Merge pull request #226 from YaleSTC/readme_edits

Thank the lord we can spell