Setuping iterm2 and terminal.app to use Solarized Light by default
Removing preferences for terminal.app
Merge branch 'master' of github.com:diegoholiveira/dotfiles

Conflicts:
	osx_rc