Downgrade from PHP 5.4 to 5.3
Make short_open_tag ON
Fix installing xdebug for PHP 5.4
Merge branch 'master' into php53
Merge branch 'master' into php53
Merge branch 'master' into php53
Merge branch 'master' into php53

Conflicts:
	provision.sh
Merge branch 'master' of github.com:kidomah/vagrant-sample into php53
Merge branch 'master' into php53
Merge branch 'master' into php53

Conflicts:
	config/xdebug.ini
	provision.sh
Merge branch 'master' into php53
Merge branch 'master' into php53
Merge branch 'master' into php53
Merge branch 'master' into php53

Conflicts:
	provision.sh
Merge branch 'master' into php53
Merge branch 'master' into php53
Merge branch 'master' into php53
Merge branch 'master' into php53
Merge branch 'master' into php53
Merge branch 'master' into php53