screenrc: add alterscreen off
gitconfig: add auto rebase
update gitconfig
Merge branch 'master' of https://github.com/jonschipp/misc

Conflicts:
	git.config/gitconfig