Made a bunch of minor spelling corrections in the test suite
Updated verbiage in smoking_gun_validator to be grammatically more precise
Created a test for the uploading of files with non-ascii characters, along with some necessary fixtures
Merged master into non_ascii_chars
Merge branch 'master' of https://github.com/projectcypress/cypress into non_ascii_chars
Merge in Mongoid.yml changes for Travis
Merged master into smoking_gun_grammar
Merged upstream master into spelling_corrections
Added missing 'end' to measures_controller_test
Merge pull request #49 from okeefm/non_ascii_chars

Created a test for the uploading of files with non-ascii characters
Merge pull request #47 from okeefm/smoking_gun_grammar

Updated verbiage in smoking_gun_validator
Merge pull request #45 from okeefm/spelling_corrections

Made a bunch of minor spelling corrections in the test suite