[Fix #391] Ask for confirmation before deleting a file that's not under VC
Enable smartparens-strict-mode in Lisps
Merge branch 'master' of https://github.com/bbatsov/prelude

* 'master' of https://github.com/bbatsov/prelude:
  Enable smartparens-strict-mode in Lisps
  [Fix #391] Ask for confirmation before deleting a file that's not under VC

Conflicts:
	modules/prelude-lisp.el