Don't swap Command & Option by default
1. Add on-screen mode
Merge branch 'master' of https://github.com/bbatsov/prelude
[Fix #378] Add folders recursively to the load-path in prelude-add-subfolders-to-load-path
Merge branch 'master' of https://github.com/bbatsov/prelude
[Fix #377] Require smartparens-latex in latex module
Merge branch 'master' of https://github.com/bbatsov/prelude

Conflicts:
	modules/prelude-latex.el
Clean code