Use inconsolata for i3bar.
Merge branch 'laptop' of github.com:brotatos/dotfiles into laptop

Conflicts:
	i3/config