Updates
Merge branch 'master' of github.com:ecnahc515/dotfiles

Update default font to 10.

* 'master' of github.com:ecnahc515/dotfiles:
  Mac stuff. Remove different colored host in promt

Conflicts:
	sublime/User/Package Control.sublime-settings