Default postgres is 9.3
Some changes
Merge branch 'master' of github.com:lleirborras/dotfiles

Conflicts:
	zsh/env