Added git 2.0 push default option.
Merge branch 'master' of github.com:pcaro90/dotfiles

Conflicts:
	git/gitconfig