Mac style scrolling.
Merge branch 'master' of https://github.com/pdixon/dotfiles

Conflicts:
	xinitrc
Merge branch 'master' of https://github.com/pdixon/dotfiles

Conflicts:
	xinitrc
Merge branch 'master' of https://github.com/pdixon/dotfiles
Merge branch 'master' of https://github.com/pdixon/dotfiles
envoy isn't working on i686.

Let's just use gpg-agent directly.
Ignore the contents of the default.target.wants/