Remove duplicated definition of magit-key-mode-current-args
Remove duplicated definition of magit-key-mode-current-options
stage all changes by pressing "s" while on a header
s/u on headers functionality
Merge commit 'e261fc07a4bb32cb1768a8d5e3fe41e0398af819' into sabof/master
Merge commit '49d1086'

Conflicts:
	magit-key-mode.el
Merge branch 'sabof/master'
Merge branch 'master' into next