.inputrc: include /etc/inputrc
beets: enable web plugin
.bashrc: add server function
git: configure defaul push behaviour
emacs: add kill-ring-save-path
bashrc: remove "-i" aliases for cp, mv, rm
bashrc: add z
Merge branch 'master' into ae

Conflicts:
	.gitconfig