Merge branch 'master' of https://github.com/bbatsov/prelude
Merge remote-tracking branch 'upstream/master'
Add prelude-term-buffer-name variable

This provides multi-term support via .dir-locals.el for example.
Merge branch 'master' of https://github.com/zouivex/.emacs.d
Merge pull request #737 from dougm/term-buffer-name

Add prelude-term-buffer-name variable
Added helper to open file with emacsclient using filename:line path

Most of console-based utilities prints filename in format
"filename:linenumber". So you may wish to open filename in that format.
This little 'advice' can do that. Just call

emacsclient filename:linenumber

and cursor will be positioned on requested line
Merge pull request #749 from lexa/emacsclient_advice

Added helper to open file with emacsclient using filename:line path
Merge branch 'master' of https://github.com/bbatsov/prelude