APOD keys in i3
Merge branch 'master' of http://github.com/slspeek/dotfiles

Conflicts:
	.i3/config