Use push simple by default
SOme changes
Set package archives
Merge branch 'master' of github.com:mdelaurentis/env

Conflicts:
	dotfiles/bashrc_extra
	dotfiles/emacs