Revert "more stealy aliases, cleanups"

This reverts commit 6545be936ce57ef151a47eef8360b8d827e20357.

This seems to have messed up copy-paste on OS X, although I still
haven't figured out why. Git bisect blames this commit, and anecdotal
testing verified this as the culprit.

Conflicts:
	.gitconfig
	.vim/init/mappings.vim