Reverts powerline back to old version
Merge branch 'master' into osx

Conflicts:
	install.sh
	vimrc
iterm updates
Reverts fonts back to old Menlo
Merge branch 'master' into osx
Merge branch 'osx' of github.com:kevincolyar/dotfiles into osx
Fixes conflict