Fixed typo for keyboard shortcut in Readme
Merge pull request #696 from helgeblod/upstream

Fixed typo for the keyboard shortcut for running tests in the Readme
Appraisals is a ruby file, too
Merge pull request #697 from schasse/appraisals_is_ruby

Appraisals is a ruby file, too
remove curly braces from js electric-layout-rules

fix #694
Merge pull request #698 from toctan/js-electric-layout-fix

Remove curly braces from js electric-layout-rules
Merge branch 'master' into personal-fork

Conflicts:
	modules/prelude-js.el