i3 changes
back to urxvt, xresources
add new power aliases, kill solarized terminal fading and spiffen up
fonts
Merge branch 'master' of github.com:mshade/dotfiles

Conflicts:
	.Xresources