Change font values
i3 font, i3 bar (+battery)
noremap was apparently deprecated...? At least in pentadactyl.
Disable nvpy notes directory temporarily
Xrdb alias.
Merge branch 'master' of https://www.github.com/rykugur/dotfiles

Conflicts:
	prezto