prelude-evil: add 'nmap Y y$' equivalent
Do not deactivate-mark if region active
Prefer advice over remap exchange-point-and-mark
Merge pull request #570 from toctan/exchange-point-and-mark

Do not deactivate-mark if region active when exchange-point-and-mark
Remove web-mode customization

- Code indent offset is subjected to personal taste, I think we should
  stick to the web-mode default, which is sensible enough, and leave it
  to the user to decide.
- `web-mode-disable-autocompletion` is no longer used by web-mode.
- As to `newline-and-indent`, I think we should be consistent across all
  major modes. And this line of code will become useless with Emacs 24.4.
Make web-mode play nice with smartparens

web-mode's auto paring is in conflict with smartparens. With
smartparens, since the closing '>' is inserted right after the opening
'<' and web-mode is not aware of that, the extra closing '>' would be
inserted. That's very annoying.
Run prelude-prog-mode-hook with CSS

I don't know if CSS should be count as a programming language, but the
utilities provided in the `prelude-prog-mode-hook`, such as
smartparens, whitespace-mode, comment annotation, are also very useful
when editing CSS files.
Merge pull request #573 from toctan/prelude-css

Run prelude-prog-mode-hook with CSS
Merge pull request #572 from toctan/prelude-web

Make web-mode play nice with smartparens
Apply prelude codestyle
Merge pull request #542 from avsej/yank-to-end-of-line

prelude-evil: add 'nmap Y y$' equivalent
Rename evil-surround due to upstream changing.
Merge pull request #575 from lazywei/upstream-master

Rename evil-surround due to upstream changing.
Merge remote-tracking branch 'bbatsov/master'
No need for web-mode customizations any more
Renamed Rails snippets to avoid collission with Prelude web-mode and smart parens customization