improve vimrc
rbenv, php56, alias for psql
Merge branch 'master' of github.com:adamico/.dotfiles

Conflicts:
	zshrc