vimrc changes
Merge branch 'master' of https://github.com/mattin4d/dotfiles

* 'master' of https://github.com/mattin4d/dotfiles:
  show ldap common name in place of hostname if set
  verbose output seems to take precedence over psql -q
Merge branch 'master' of https://github.com/mattin4d/dotfiles

* 'master' of https://github.com/mattin4d/dotfiles:
  make extip
  bring back old phpdoc
  adding vim-blade plugin
  no paren around ldapcn hostname to stay consistent

Conflicts:
	vimrc