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

Conflicts:
	tmux.conf