Fix encoding issues on us-ascii shells with ruby 1.9 and 2.0
Merge branch 'master' into sign-in-with-github

Conflicts:
	app/views/scripts/capture.rb.erb