Merge branch 'cairo' into develop

Conflicts:
	pkgs/development/libraries/glib/default.nix
Merge branch 'vim' into develop
php53: fix on darwin

* add libssh2 to build inputs (configure fails without this)
* link with stdc++
* add icu/lib directory to DYLD_LIBRARY_PATH (and wrap binaries with this
  environment variable
* add libiconv to build inputs
* fix --with-iconv configure flag (was --with-iconv-dir which is not a valid
  flag)
Merge branch 'php53' into develop

Conflicts:
	pkgs/development/interpreters/php/5.3.nix
fix php