If no region is marked, C-w will kill the last word

Conflicts:
	parts/006-keys.el
Added shortcut for ace-jump-mode-pop-mark
Merge remote-tracking branch 'upstream/master' into shortcuts
Added kill-line-or-region/save-line-or-region
Merge pull request #39 from r-darwish/shortcuts

Shortcuts