don't set standby delay to 24 hours; 1 hour is fine
leave notification center alone
let natural scrolling be
update languages for us english + portuguese
update timezone to sao paulo
don't allow closing finder
add some extra global .gitignore stuff for working with phpstorm and sass
added some extra git aliases
use atom for the default git editor
also use atom for the default system editor
commented out some unused software in caskfile
add extra apps in caskfile
Merge branch 'master' of github.com:alexweber/dotfiles

Conflicts:
	.gitconfig