.
Merge branch 'master' of github.com:florianeckerstorfer/dotfiles

* 'master' of github.com:florianeckerstorfer/dotfiles:
  Fixed regex in sf2 completion
  Improved sf2 auto completion
  Improved performance of Symfony2 bash completion
  Updated exports for PHP 5.4

Conflicts:
	.exports