Merge branch 'master' into debian
Reverts powerline back to old version
Reverts fonts back to old Menlo
Merge branch 'master' into debian

Conflicts:
	tmux.conf
Merge branch 'debian' into debian-dreamhost
Merge branch 'debian' into debian-dreamhost
Adds vi filetype header
Merge branch 'master' of github.com:kevincolyar/dotfiles
Merge branch 'master' into debian-dreamhost