Update line moving commands
Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Address a warning
Make delete-file-and-buffer vc aware
Minor changes
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Minor changes
  Make delete-file-and-buffer vc aware
  Address a warning
  Update line moving commands